mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-29 12:36:53 +00:00
Use chacha20-ietf as a default cipher instead of rc4-md5 (#2080)
* Use chacha20-ietf as a default cipher instead of rc4-md5 * Update tunnel.c * Update utils.c * Update ss-local.asciidoc * Update ss-local.asciidoc * Update tunnel.c * Update ss-tunnel.asciidoc * Update ss-manager.asciidoc * Update ss-redir.asciidoc * Update shadowsocks-libev.asciidoc * Update aead.c * Update local.c * Update server.c * Update utils.c
This commit is contained in:
@@ -64,7 +64,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
|
||||
camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
|
||||
chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
|
||||
+
|
||||
The default cipher is 'rc4-md5'.
|
||||
The default cipher is 'chacha20-ietf-poly1305'.
|
||||
+
|
||||
If built with PolarSSL or custom OpenSSL libraries, some of
|
||||
these ciphers may not work.
|
||||
|
||||
@@ -59,7 +59,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
|
||||
camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
|
||||
chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
|
||||
+
|
||||
The default cipher is 'rc4-md5'.
|
||||
The default cipher is 'chacha20-ietf-poly1305'.
|
||||
+
|
||||
If built with PolarSSL or custom OpenSSL libraries, some of
|
||||
these ciphers may not work.
|
||||
|
||||
@@ -51,7 +51,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
|
||||
camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
|
||||
chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
|
||||
+
|
||||
The default cipher is 'rc4-md5'.
|
||||
The default cipher is 'chacha20-ietf-poly1305'.
|
||||
+
|
||||
If built with PolarSSL or custom OpenSSL libraries, some of
|
||||
these ciphers may not work.
|
||||
|
||||
@@ -58,7 +58,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
|
||||
camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
|
||||
chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
|
||||
+
|
||||
The default cipher is 'rc4-md5'.
|
||||
The default cipher is 'chacha20-ietf-poly1305'.
|
||||
+
|
||||
If built with PolarSSL or custom OpenSSL libraries, some of
|
||||
these ciphers may not work.
|
||||
|
||||
@@ -58,7 +58,7 @@ aes-128-ctr, aes-192-ctr, aes-256-ctr, bf-cfb,
|
||||
camellia-128-cfb, camellia-192-cfb, camellia-256-cfb,
|
||||
chacha20-ietf-poly1305, salsa20, chacha20 and chacha20-ietf.
|
||||
+
|
||||
The default cipher is 'rc4-md5'.
|
||||
The default cipher is 'chacha20-ietf-poly1305'.
|
||||
+
|
||||
If built with PolarSSL or custom OpenSSL libraries, some of
|
||||
these ciphers may not work.
|
||||
|
||||
+2
-2
@@ -719,8 +719,8 @@ aead_init(const char *pass, const char *key, const char *method)
|
||||
break;
|
||||
}
|
||||
if (m >= AEAD_CIPHER_NUM) {
|
||||
LOGE("Invalid cipher name: %s, use aes-256-gcm instead", method);
|
||||
m = AES256GCM;
|
||||
LOGE("Invalid cipher name: %s, use chacha20-ietf-poly1305 instead", method);
|
||||
m = CHACHA20POLY1305IETF;
|
||||
}
|
||||
}
|
||||
return aead_key_init(m, pass, key);
|
||||
|
||||
+1
-1
@@ -1697,7 +1697,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (method == NULL) {
|
||||
method = "rc4-md5";
|
||||
method = "chacha20-ietf-poly1305";
|
||||
}
|
||||
|
||||
if (timeout == NULL) {
|
||||
|
||||
+1
-1
@@ -1860,7 +1860,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (method == NULL) {
|
||||
method = "rc4-md5";
|
||||
method = "chacha20-ietf-poly1305";
|
||||
}
|
||||
|
||||
if (timeout == NULL) {
|
||||
|
||||
+2
-2
@@ -677,8 +677,8 @@ stream_init(const char *pass, const char *key, const char *method)
|
||||
break;
|
||||
}
|
||||
if (m >= STREAM_CIPHER_NUM) {
|
||||
LOGE("Invalid cipher name: %s, use rc4-md5 instead", method);
|
||||
m = RC4_MD5;
|
||||
LOGE("Invalid cipher name: %s, use chacha20-ietf instead", method);
|
||||
m = CHACHA20IETF;
|
||||
}
|
||||
}
|
||||
if (m == TABLE) {
|
||||
|
||||
+1
-1
@@ -1021,7 +1021,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (method == NULL) {
|
||||
method = "rc4-md5";
|
||||
method = "chacha20-ietf-poly1305";
|
||||
}
|
||||
|
||||
if (timeout == NULL) {
|
||||
|
||||
+1
-1
@@ -317,7 +317,7 @@ usage()
|
||||
printf(
|
||||
" salsa20, chacha20 and chacha20-ietf.\n");
|
||||
printf(
|
||||
" The default cipher is rc4-md5.\n");
|
||||
" The default cipher is chacha20-ietf-poly1305.\n");
|
||||
printf("\n");
|
||||
printf(
|
||||
" [-a <user>] Run as another user.\n");
|
||||
|
||||
Reference in New Issue
Block a user