From a6bbe2dd05e8f0b354e92d50d548c596baf231b7 Mon Sep 17 00:00:00 2001 From: "Y. T. Chung" Date: Thu, 31 Aug 2017 23:51:40 +0800 Subject: [PATCH] bump to v1.6.5, rename chacha20-ietf-poly1305 * fixed #65 --- Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 2 +- src/crypto/cipher.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01598ca0..1acf5cfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [root] name = "shadowsocks-rust" -version = "1.6.4" +version = "1.6.5" dependencies = [ "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte_string 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 74685928..0f594d20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shadowsocks-rust" -version = "1.6.4" +version = "1.6.5" authors = ["Y. T. CHUNG "] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." repository = "https://github.com/zonyitoo/shadowsocks-rust" diff --git a/README.md b/README.md index 8b097fd8..2f0dec4c 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ List all available arguments with `-h`. * `chacha20`, `salsa20`, `chacha20-ietf` * `dummy` (No encryption, just for debugging) * `aes-128-gcm`, `aes-192-gcm`, `aes-256-gcm` -* `chacha20-poly1305` +* `chacha20-ietf-poly1305` ## Useful Tools diff --git a/src/crypto/cipher.rs b/src/crypto/cipher.rs index ba5d2350..f0e783ba 100644 --- a/src/crypto/cipher.rs +++ b/src/crypto/cipher.rs @@ -92,7 +92,7 @@ const CIPHER_DUMMY: &'static str = "dummy"; const CIPHER_AES_128_GCM: &'static str = "aes-128-gcm"; const CIPHER_AES_256_GCM: &'static str = "aes-256-gcm"; -const CIPHER_CHACHA20_POLY1305: &'static str = "chacha20-poly1305"; +const CIPHER_CHACHA20_POLY1305: &'static str = "chacha20-ietf-poly1305"; /// ShadowSocks cipher type #[derive(Clone, Debug, Copy)]