From 04f420ff1e72876526b6784d3674f34d77e1294a Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 17 Apr 2021 20:55:46 +0800 Subject: [PATCH] update shadowsocks-crypto to v0.2.1 - updated crypto2 to 0.1.2 - support AEAD extra ciphers with aead-cipher-extra - fixes shadowsocks/shadowsocks-android#2663 - ref shadowsocks/shadowsocks-crypto#8 --- Cargo.lock | 42 +++++++++++++-------------- Cargo.toml | 6 +++- crates/shadowsocks-service/Cargo.toml | 6 +++- crates/shadowsocks/Cargo.toml | 6 +++- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 534486758ca4..147727d2a89e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,9 +244,9 @@ dependencies = [ [[package]] name = "crypto2" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a195a71be2ecc2712366d8a7a7e8b4f9a94c80822ff178c7cf1c4e73f5eb1" +checksum = "a161713d9e77a76b166714fc1efd2a7d0a6830e8be57eb727b215076fb62e7a4" [[package]] name = "daemonize" @@ -579,9 +579,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.3.6" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc35c995b9d93ec174cf9a27d425c7892722101e14993cd227fdb51d70cf9589" +checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437" [[package]] name = "httpdate" @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -924,9 +924,9 @@ dependencies = [ [[package]] name = "notify" -version = "5.0.0-pre.6" +version = "5.0.0-pre.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fd82b93434edb9c00ae65ee741e0e081cdc8c63346ab9f687935a629aaf4c3" +checksum = "1ebe7699a0f8c5759450716ee03d231685c22b4fe8f406c42c22e0ad94d40ce7" dependencies = [ "anymap", "bitflags", @@ -1109,18 +1109,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6" +checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5" +checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2", "quote", @@ -1304,9 +1304,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64", "log", @@ -1470,7 +1470,7 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.10.2" +version = "1.10.3" dependencies = [ "arc-swap 1.2.0", "async-trait", @@ -1503,9 +1503,9 @@ dependencies = [ [[package]] name = "shadowsocks-crypto" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdab504fa29a1ff72b862cde608833b725187cf444ab5cb2567c3ee49f6a8250" +checksum = "98225f2209377b563a8941166a04bf8d92c891893490f063350548b75fd171b9" dependencies = [ "crypto2", "rand", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "shadowsocks-rust" -version = "1.10.5" +version = "1.10.6" dependencies = [ "byte_string", "byteorder", @@ -1535,7 +1535,7 @@ dependencies = [ [[package]] name = "shadowsocks-service" -version = "1.10.4" +version = "1.10.5" dependencies = [ "async-trait", "byte_string", @@ -2103,9 +2103,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" +checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" [[package]] name = "vec_map" diff --git a/Cargo.toml b/Cargo.toml index 503fce01e305..a29885209d8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-rust" -version = "1.10.5" +version = "1.10.6" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -107,6 +107,10 @@ multi-threaded = ["tokio/rt-multi-thread"] # Users should always avoid using these ciphers in practice stream-cipher = ["shadowsocks-service/stream-cipher"] +# Enable extra AEAD ciphers +# WARN: These non-standard AEAD ciphers are not officially supported by shadowsocks community +aead-cipher-extra = ["shadowsocks-service/aead-cipher-extra"] + [dependencies] log = "0.4" log4rs = { version = "1.0", optional = true } diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml index af8de87ec466..b6103a11c460 100644 --- a/crates/shadowsocks-service/Cargo.toml +++ b/crates/shadowsocks-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-service" -version = "1.10.4" +version = "1.10.5" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -62,6 +62,10 @@ local-socks4 = ["local"] # Users should always avoid using these ciphers in practice stream-cipher = ["shadowsocks/stream-cipher"] +# Enable extra AEAD ciphers +# WARN: These non-standard AEAD ciphers are not officially supported by shadowsocks community +aead-cipher-extra = ["shadowsocks/aead-cipher-extra"] + [dependencies] log = "0.4" log4rs = "1.0" diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml index d0f860985f17..da8660e5b1b8 100644 --- a/crates/shadowsocks/Cargo.toml +++ b/crates/shadowsocks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks" -version = "1.10.2" +version = "1.10.3" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/shadowsocks/shadowsocks-rust" @@ -27,6 +27,10 @@ trust-dns = ["trust-dns-resolver", "arc-swap", "notify"] # Users should always avoid using these ciphers in practice stream-cipher = ["shadowsocks-crypto/v1-stream"] +# Enable extra AEAD ciphers +# WARN: These non-standard AEAD ciphers are not officially supported by shadowsocks community +aead-cipher-extra = ["shadowsocks-crypto/v1-aead-extra"] + [dependencies] log = "0.4"