From 1e7bb4512ca35456c5a2fe48b58ac3d0721e1dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= Date: Tue, 28 Apr 2020 15:43:55 +0800 Subject: [PATCH 1/3] `xchacha20-ietf-poly1305` completion --- completions/bash/ss-local | 2 +- completions/bash/ss-manager | 2 +- completions/bash/ss-redir | 2 +- completions/bash/ss-server | 2 +- completions/bash/ss-tunnel | 2 +- completions/zsh/_ss-local | 2 +- completions/zsh/_ss-manager | 2 +- completions/zsh/_ss-redir | 2 +- completions/zsh/_ss-server | 2 +- completions/zsh/_ss-tunnel | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/completions/bash/ss-local b/completions/bash/ss-local index 0186ccc4..2d1f8085 100644 --- a/completions/bash/ss-local +++ b/completions/bash/ss-local @@ -2,7 +2,7 @@ _ss_local() { local cur prev opts ciphers opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -v -h --reuse-port --fast-open --acl --mtu --mptcp --no-delay --key --plugin --plugin-opts --help' - ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' + ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' cur=${COMP_WORDS[COMP_CWORD]} prev="${COMP_WORDS[COMP_CWORD-1]}" case "$prev" in diff --git a/completions/bash/ss-manager b/completions/bash/ss-manager index d3168a3b..ebc8e7be 100644 --- a/completions/bash/ss-manager +++ b/completions/bash/ss-manager @@ -2,7 +2,7 @@ _ss_manager() { local cur prev opts ciphers opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -v -h --reuse-port --manager-address --executable --mtu --mptcp --plugin --plugin-opts --help' - ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' + ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' cur=${COMP_WORDS[COMP_CWORD]} prev="${COMP_WORDS[COMP_CWORD-1]}" case "$prev" in diff --git a/completions/bash/ss-redir b/completions/bash/ss-redir index 9a14efe8..a45c59ef 100644 --- a/completions/bash/ss-redir +++ b/completions/bash/ss-redir @@ -2,7 +2,7 @@ _ss_redir() { local cur prev opts ciphers opts='-s -p -l -k -m -a -f -t -c -n -b -u -U -v -h --reuse-port --mtu --mptcp --key --plugin --plugin-opts --help' - ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' + ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' cur=${COMP_WORDS[COMP_CWORD]} prev="${COMP_WORDS[COMP_CWORD-1]}" case "$prev" in diff --git a/completions/bash/ss-server b/completions/bash/ss-server index cec983ce..535987fb 100644 --- a/completions/bash/ss-server +++ b/completions/bash/ss-server @@ -2,7 +2,7 @@ _ss_server() { local cur prev opts ciphers opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -6 -d -v -h --reuse-port --fast-open --acl --manager-address --mtu --mptcp --no-delay --key --plugin --plugin-opts --help' - ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' + ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} prev="${COMP_WORDS[COMP_CWORD-1]}" diff --git a/completions/bash/ss-tunnel b/completions/bash/ss-tunnel index 707dc7a9..6c330468 100644 --- a/completions/bash/ss-tunnel +++ b/completions/bash/ss-tunnel @@ -2,7 +2,7 @@ _ss_tunnel() { local cur prev opts ciphers opts='-s -p -l -k -m -a -f -t -c -n -i -b -u -U -L -v -h --reuse-port --mtu --mptcp --key --plugin --plugin-opts --help' - ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' + ciphers='rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf' cur=${COMP_WORDS[COMP_CWORD]} prev="${COMP_WORDS[COMP_CWORD-1]}" compopt +o nospace diff --git a/completions/zsh/_ss-local b/completions/zsh/_ss-local index c56ed521..4b826547 100644 --- a/completions/zsh/_ss-local +++ b/completions/zsh/_ss-local @@ -1,7 +1,7 @@ #compdef ss-local local ciphers -ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' +ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' _arguments "-h::" \ "-s:server host:_hosts" \ diff --git a/completions/zsh/_ss-manager b/completions/zsh/_ss-manager index 3e65f6c8..c6891e93 100644 --- a/completions/zsh/_ss-manager +++ b/completions/zsh/_ss-manager @@ -1,7 +1,7 @@ #compdef ss-manager local ciphers -ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' +ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' _arguments "-h::" \ "-s:server host:_hosts" \ diff --git a/completions/zsh/_ss-redir b/completions/zsh/_ss-redir index 4f3b065e..1d49b379 100644 --- a/completions/zsh/_ss-redir +++ b/completions/zsh/_ss-redir @@ -1,7 +1,7 @@ #compdef ss-redir local ciphers -ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' +ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' _arguments "-h::" \ "-s:server host:_hosts" \ diff --git a/completions/zsh/_ss-server b/completions/zsh/_ss-server index 8d9f4316..94882cec 100644 --- a/completions/zsh/_ss-server +++ b/completions/zsh/_ss-server @@ -1,7 +1,7 @@ #compdef ss-server local ciphers -ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' +ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' _arguments "-h::" \ "-s:server host:_hosts" \ diff --git a/completions/zsh/_ss-tunnel b/completions/zsh/_ss-tunnel index 5a269900..3bcaf7f9 100644 --- a/completions/zsh/_ss-tunnel +++ b/completions/zsh/_ss-tunnel @@ -1,7 +1,7 @@ #compdef ss-tunnel local ciphers -ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' +ciphers='(rc4-md5 aes-128-gcm aes-192-gcm aes-256-gcm aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr camellia-128-cfb camellia-192-cfb camellia-256-cfb bf-cfb chacha20-ietf-poly1305 xchacha20-ietf-poly1305 salsa20 chacha20 chacha20-ietf)' _arguments "-h::" \ "-s:server host:_hosts" \ From 2cc92827e5dd21420c5075fc9852995047131067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= Date: Tue, 28 Apr 2020 15:44:20 +0800 Subject: [PATCH 2/3] `xchacha20-ietf-poly1305` doc --- doc/shadowsocks-libev.asciidoc | 3 ++- doc/ss-local.asciidoc | 3 ++- doc/ss-manager.asciidoc | 3 ++- doc/ss-redir.asciidoc | 3 ++- doc/ss-server.asciidoc | 3 ++- doc/ss-tunnel.asciidoc | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/shadowsocks-libev.asciidoc b/doc/shadowsocks-libev.asciidoc index 13cddc87..528b2c5a 100644 --- a/doc/shadowsocks-libev.asciidoc +++ b/doc/shadowsocks-libev.asciidoc @@ -62,7 +62,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + The default cipher is 'chacha20-ietf-poly1305'. + diff --git a/doc/ss-local.asciidoc b/doc/ss-local.asciidoc index 68fc8354..bc247497 100644 --- a/doc/ss-local.asciidoc +++ b/doc/ss-local.asciidoc @@ -57,7 +57,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + The default cipher is 'chacha20-ietf-poly1305'. + diff --git a/doc/ss-manager.asciidoc b/doc/ss-manager.asciidoc index 189dfa6b..c2d02672 100644 --- a/doc/ss-manager.asciidoc +++ b/doc/ss-manager.asciidoc @@ -49,7 +49,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + The default cipher is 'chacha20-ietf-poly1305'. + diff --git a/doc/ss-redir.asciidoc b/doc/ss-redir.asciidoc index f8008b5f..df931148 100644 --- a/doc/ss-redir.asciidoc +++ b/doc/ss-redir.asciidoc @@ -56,7 +56,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + The default cipher is 'chacha20-ietf-poly1305'. + diff --git a/doc/ss-server.asciidoc b/doc/ss-server.asciidoc index 0dcddffa..528fd113 100644 --- a/doc/ss-server.asciidoc +++ b/doc/ss-server.asciidoc @@ -54,7 +54,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + If built with PolarSSL or custom OpenSSL libraries, some of these ciphers may not work. diff --git a/doc/ss-tunnel.asciidoc b/doc/ss-tunnel.asciidoc index a6f212a9..dc626a72 100644 --- a/doc/ss-tunnel.asciidoc +++ b/doc/ss-tunnel.asciidoc @@ -56,7 +56,8 @@ aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, 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. +chacha20-ietf-poly1305, xchacha20-ietf-poly1305, +salsa20, chacha20 and chacha20-ietf. + The default cipher is 'chacha20-ietf-poly1305'. + From 2ae8006ee3070c31854c0ec2f96a68bf8920cc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=BF=83=E7=A6=BE?= Date: Wed, 29 Apr 2020 09:50:03 +0800 Subject: [PATCH 3/3] *Shadowsocks-libev* accepts 19 different ciphers --- doc/shadowsocks-libev.asciidoc | 2 +- doc/ss-local.asciidoc | 2 +- doc/ss-manager.asciidoc | 2 +- doc/ss-redir.asciidoc | 2 +- doc/ss-server.asciidoc | 2 +- doc/ss-tunnel.asciidoc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/shadowsocks-libev.asciidoc b/doc/shadowsocks-libev.asciidoc index 528b2c5a..c3d9df84 100644 --- a/doc/shadowsocks-libev.asciidoc +++ b/doc/shadowsocks-libev.asciidoc @@ -56,7 +56,7 @@ Not available in manager mode. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, diff --git a/doc/ss-local.asciidoc b/doc/ss-local.asciidoc index bc247497..46ce8c82 100644 --- a/doc/ss-local.asciidoc +++ b/doc/ss-local.asciidoc @@ -51,7 +51,7 @@ Set the key directly. The key should be encoded with URL-safe Base64. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, diff --git a/doc/ss-manager.asciidoc b/doc/ss-manager.asciidoc index c2d02672..0c127570 100644 --- a/doc/ss-manager.asciidoc +++ b/doc/ss-manager.asciidoc @@ -43,7 +43,7 @@ Set the password. The server and the client should use the same password. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, diff --git a/doc/ss-redir.asciidoc b/doc/ss-redir.asciidoc index df931148..56fe1839 100644 --- a/doc/ss-redir.asciidoc +++ b/doc/ss-redir.asciidoc @@ -50,7 +50,7 @@ Set the key directly. The key should be encoded with URL-safe Base64. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, diff --git a/doc/ss-server.asciidoc b/doc/ss-server.asciidoc index 528fd113..d06cd191 100644 --- a/doc/ss-server.asciidoc +++ b/doc/ss-server.asciidoc @@ -48,7 +48,7 @@ Set the key directly. The key should be encoded with URL-safe Base64. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, diff --git a/doc/ss-tunnel.asciidoc b/doc/ss-tunnel.asciidoc index dc626a72..26fabafb 100644 --- a/doc/ss-tunnel.asciidoc +++ b/doc/ss-tunnel.asciidoc @@ -50,7 +50,7 @@ Set the key directly. The key should be encoded with URL-safe Base64. -m :: Set the cipher. + -*Shadowsocks-libev* accepts 18 different ciphers: +*Shadowsocks-libev* accepts 19 different ciphers: + aes-128-gcm, aes-192-gcm, aes-256-gcm, rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb,