SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-06 05:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add password support for shadowsocks 2022 ciphers

Browse source
This commit is contained in:
世界 2022-05-12 16:46:38 +08:00
parent f1a5f8aaa3
commit 2aae93c5b8
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
11 changed files with 204 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

10
protocol/shadowsocks/shadowstream/protocol.go
View file

@ -53,7 +53,7 @@ type Method struct {
secureRNG io.Reader
}
func New(method string, key []byte, password []byte, secureRNG io.Reader) (shadowsocks.Method, error) {
func New(method string, key []byte, password string, secureRNG io.Reader) (shadowsocks.Method, error) {
m := &Method{
name: method,
secureRNG: secureRNG,
@ -167,11 +167,11 @@ func New(method string, key []byte, password []byte, secureRNG io.Reader) (shado
if len(key) == m.keyLength {
m.key = key
} else if len(key) > 0 {
return nil, shadowaead.ErrBadKey
} else if len(password) > 0 {
m.key = shadowsocks.Key(password, m.keyLength)
return nil, shadowsocks.ErrBadKey
} else if password != "" {
m.key = shadowsocks.Key([]byte(password), m.keyLength)
} else {
return nil, shadowaead.ErrMissingPassword
return nil, shadowsocks.ErrMissingPassword
}
return m, nil
}