From 7d2b46e9198934bf8072db9762066969298b5caa Mon Sep 17 00:00:00 2001 From: Zou Yong Date: Thu, 23 Mar 2017 13:40:52 +0800 Subject: [PATCH] Fix help msg --- shadowsocks/shell.py | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py index 4cce8a5..df04cee 100644 --- a/shadowsocks/shell.py +++ b/shadowsocks/shell.py @@ -384,21 +384,19 @@ Proxy options: Sodium 1.0.12: xchacha20 OpenSSL: - aes-[128|192|256]-gcm, aes-[128|192|256]-cfb, - aes-[128|192|256]-ofb, aes-[128|192|256]-ctr, - camellia-[128|192|256]-cfb, + aes-{128|192|256}-gcm, aes-{128|192|256}-cfb, + aes-{128|192|256}-ofb, aes-{128|192|256}-ctr, + camellia-{128|192|256}-cfb, bf-cfb, cast5-cfb, des-cfb, idea-cfb, rc2-cfb, seed-cfb, rc4, rc4-md5, table. OpenSSL 1.1: - aes-[128|192|256]-ocb + aes-{128|192|256}-ocb mbedTLS: - mbedtls:aes-[128|192|256]-cfb128, - mbedtls:aes-[128|192|256]-ctr, - mbedtls:camellia-[128|192|256]-cfb128, - mbedtls:salsa20, mbedtls:chacha20, - mbedtls:chacha20-ietf, - mbedtls:aes[128|192|256]-gcm + mbedtls:aes-{128|192|256}-cfb128, + mbedtls:aes-{128|192|256}-ctr, + mbedtls:camellia-{128|192|256}-cfb128, + mbedtls:aes-{128|192|256}-gcm -t TIMEOUT timeout in seconds, default: 300 -a ONE_TIME_AUTH one time auth --fast-open use TCP_FASTOPEN, requires Linux 3.7+ @@ -440,21 +438,19 @@ Proxy options: Sodium 1.0.12: xchacha20 OpenSSL: - aes-[128|192|256]-gcm, aes-[128|192|256]-cfb, - aes-[128|192|256]-ofb, aes-[128|192|256]-ctr, - camellia-[128|192|256]-cfb, + aes-{128|192|256}-gcm, aes-{128|192|256}-cfb, + aes-{128|192|256}-ofb, aes-{128|192|256}-ctr, + camellia-{128|192|256}-cfb, bf-cfb, cast5-cfb, des-cfb, idea-cfb, rc2-cfb, seed-cfb, rc4, rc4-md5, table. OpenSSL 1.1: - aes-[128|192|256]-ocb + aes-{128|192|256}-ocb mbedTLS: - mbedtls:aes-[128|192|256]-cfb128, - mbedtls:aes-[128|192|256]-ctr, - mbedtls:camellia-[128|192|256]-cfb128, - mbedtls:salsa20, mbedtls:chacha20, - mbedtls:chacha20-ietf, - mbedtls:aes[128|192|256]-gcm + mbedtls:aes-{128|192|256}-cfb128, + mbedtls:aes-{128|192|256}-ctr, + mbedtls:camellia-{128|192|256}-cfb128, + mbedtls:aes-{128|192|256}-gcm -t TIMEOUT timeout in seconds, default: 300 -a ONE_TIME_AUTH one time auth --fast-open use TCP_FASTOPEN, requires Linux 3.7+