Merge pull request #50 from yuhan6665/master

Fix parser for shadowsocks cipher "none"
4 years ago · 3a7784b3e2
parent 5d31c54bdf 2e20d34f84
commit 3a7784b3e2
1 changed files with 2 additions and 0 deletions
--- a/infra/conf/shadowsocks.go
+++ b/infra/conf/shadowsocks.go
@ -26,6 +26,8 @@ func cipherFromString(c string) shadowsocks.CipherType {
 		return shadowsocks.CipherType_AES_256_GCM
 	case "chacha20-poly1305", "aead_chacha20_poly1305", "chacha20-ietf-poly1305":
 		return shadowsocks.CipherType_CHACHA20_POLY1305
+	case "none", "plain":
+		return shadowsocks.CipherType_NONE
 	default:
 		return shadowsocks.CipherType_UNKNOWN
 	}