bump to v1.6.5, rename chacha20-ietf-poly1305

zonyitoo · zonyitoo · commit a6bbe2dd05e8 · 2017-08-31T23:52:13.000+08:00
* fixed #65
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <zonyitoo@gmail.com>"]
 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
@@ -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
@@ -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)]
