Add shadowsocks-crypto

This commit is contained in:
luozijun
2020-11-16 23:50:24 +08:00
committed by ty
parent 1758313447
commit c550913247
35 changed files with 573 additions and 3115 deletions

View File

@@ -10,10 +10,10 @@ use tokio::{
prelude::*,
time::{self, Duration},
};
use shadowsocks_crypto::v1::CipherKind;
use shadowsocks::{
config::{Config, ConfigType, ServerAddr, ServerConfig},
crypto::CipherType,
relay::socks4::{Address, Command, HandshakeRequest, HandshakeResponse, ResultCode},
run_local,
run_server,
@@ -26,7 +26,7 @@ pub struct Socks4TestServer {
}
impl Socks4TestServer {
pub fn new<S, L>(svr_addr: S, local_addr: L, pwd: &str, method: CipherType) -> Socks4TestServer
pub fn new<S, L>(svr_addr: S, local_addr: L, pwd: &str, method: CipherKind) -> Socks4TestServer
where
S: ToSocketAddrs,
L: ToSocketAddrs,
@@ -73,7 +73,7 @@ async fn socks4_relay_connect() {
const LOCAL_ADDR: &str = "127.0.0.1:7200";
const PASSWORD: &str = "test-password";
const METHOD: CipherType = CipherType::Aes128Gcm;
const METHOD: CipherKind = CipherKind::AES_128_GCM;
let svr = Socks4TestServer::new(SERVER_ADDR, LOCAL_ADDR, PASSWORD, METHOD);
svr.run().await;

View File

@@ -7,10 +7,10 @@ use tokio::{
prelude::*,
time::{self, Duration},
};
use shadowsocks_crypto::v1::CipherKind;
use shadowsocks::{
config::{Config, ConfigType, Mode, ServerAddr, ServerConfig},
crypto::CipherType,
relay::{socks5::Address, tcprelay::client::Socks5Client},
run_local,
run_server,
@@ -23,7 +23,7 @@ pub struct Socks5TestServer {
}
impl Socks5TestServer {
pub fn new<S, L>(svr_addr: S, local_addr: L, pwd: &str, method: CipherType, enable_udp: bool) -> Socks5TestServer
pub fn new<S, L>(svr_addr: S, local_addr: L, pwd: &str, method: CipherKind, enable_udp: bool) -> Socks5TestServer
where
S: ToSocketAddrs,
L: ToSocketAddrs,
@@ -72,7 +72,7 @@ async fn socks5_relay_stream() {
const LOCAL_ADDR: &str = "127.0.0.1:8200";
const PASSWORD: &str = "test-password";
const METHOD: CipherType = CipherType::Aes128Cfb;
const METHOD: CipherKind = CipherKind::AES_128_CFB128;
let svr = Socks5TestServer::new(SERVER_ADDR, LOCAL_ADDR, PASSWORD, METHOD, false);
svr.run().await;
@@ -105,7 +105,7 @@ async fn socks5_relay_aead() {
const LOCAL_ADDR: &str = "127.0.0.1:8210";
const PASSWORD: &str = "test-password";
const METHOD: CipherType = CipherType::Aes256Gcm;
const METHOD: CipherKind = CipherKind::AES_256_GCM;
let svr = Socks5TestServer::new(SERVER_ADDR, LOCAL_ADDR, PASSWORD, METHOD, false);
svr.run().await;

View File

@@ -4,10 +4,10 @@ use std::net::SocketAddr;
use log::debug;
use tokio::time::{self, Duration};
use shadowsocks_crypto::v1::CipherKind;
use shadowsocks::{
config::{Config, ConfigType, Mode, ServerConfig},
crypto::CipherType,
relay::{socks5::Address, udprelay::client::Socks5Client},
run_local,
run_server,
@@ -19,7 +19,7 @@ const LOCAL_ADDR: &str = "127.0.0.1:8291";
const UDP_ECHO_SERVER_ADDR: &str = "127.0.0.1:50403";
const PASSWORD: &str = "test-password";
const METHOD: CipherType = CipherType::Aes128Gcm;
const METHOD: CipherKind = CipherKind::AES_128_GCM;
fn get_svr_config() -> Config {
let mut cfg = Config::new(ConfigType::Server);