From 2e5d5ea46c62f98b719021ce635240ae6fbf2d89 Mon Sep 17 00:00:00 2001
From: Yuk1n0 <39364985+Yuk1n0@users.noreply.github.com>
Date: Fri, 1 Nov 2019 12:16:25 +0800
Subject: [PATCH] Remove some unsafe ciphers

---
 README.md          | 21 ++++++---------------
 shadowsocks-all.sh | 14 ++------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 2064cee..6d5f8d1 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Shadowsocks-Go 版：
 Shadowsocks-libev 版：
 /etc/shadowsocks-libev/config.json
 
-可选 16 种加密方式的其中之一（Python 和 libev 版）
+可选 14 种加密方式的其中之一（Python 和 libev 版）
 aes-256-gcm
 aes-192-gcm
 aes-128-gcm
@@ -57,10 +57,8 @@ camellia-192-cfb
 camellia-256-cfb
 chacha20-ietf-poly1305
 chacha20-ietf
-chacha20
-rc4-md5
 
-可选 9 种加密方式的其中之一（Go 版）
+可选 7 种加密方式的其中之一（Go 版）
 aes-256-cfb
 aes-192-cfb
 aes-128-cfb
@@ -68,26 +66,19 @@ aes-256-ctr
 aes-192-ctr
 aes-128-ctr
 chacha20-ietf
-chacha20
-rc4-md5
 
-可选 15 种加密方式的其中之一（none 是不加密，ShadowsocksR 版）
+可选 10 种加密方式的其中之一（none 是不加密，ShadowsocksR 版）
 none
 aes-256-cfb
 aes-192-cfb
 aes-128-cfb
-aes-256-cfb8
-aes-192-cfb8
-aes-128-cfb8
+aes-256-cfb
+aes-192-cfb
+aes-128-cfb
 aes-256-ctr
 aes-192-ctr
 aes-128-ctr
 chacha20-ietf
-chacha20
-salsa20
-xchacha20
-xsalsa20
-rc4-md5
 
 可选 7 种协议（protocol）的其中之一（仅限 ShadowsocksR 版）
 origin
diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh
index 262b259..25f776d 100644
--- a/shadowsocks-all.sh
+++ b/shadowsocks-all.sh
@@ -4,7 +4,7 @@ export PATH
 #
 # Auto install Shadowsocks Server (all version)
 #
-# Copyright (C) 2016-2019 Teddysun <i@teddysun.com>
+# Copyright (C) 2016-2019 Teddysun <i@teddysun.com> Licensed: GPLv3
 #
 # System Required:  CentOS 6+, Debian7+, Ubuntu12+
 #
@@ -24,6 +24,7 @@ export PATH
 # @madeye     <https://github.com/madeye>
 # @linusyang  <https://github.com/linusyang>
 # @Akkariiin  <https://github.com/Akkariiin>
+# @teddysun   <https://github.com/teddysun>
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -86,9 +87,6 @@ camellia-256-cfb
 xchacha20-ietf-poly1305
 chacha20-ietf-poly1305
 chacha20-ietf
-chacha20
-salsa20
-rc4-md5
 )
 go_ciphers=(
 aes-256-cfb
@@ -98,9 +96,6 @@ aes-256-ctr
 aes-192-ctr
 aes-128-ctr
 chacha20-ietf
-chacha20
-salsa20
-rc4-md5
 )
 r_ciphers=(
 none
@@ -114,11 +109,6 @@ aes-256-ctr
 aes-192-ctr
 aes-128-ctr
 chacha20-ietf
-chacha20
-salsa20
-xchacha20
-xsalsa20
-rc4-md5
 )
 # Reference URL:
 # https://github.com/shadowsocksr-rm/shadowsocks-rss/blob/master/ssr.md