github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #50 from yuhan6665/master 

Fix parser for shadowsocks cipher "none"
pull/2667/head
Kslr 2020-07-15 04:14:57 +08:00 committed by GitHub
parent 5d31c54bdf 2e20d34f84
commit 3a7784b3e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/conf/shadowsocks.go
View File

@ -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
}