SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 12:57: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

21
protocol/shadowsocks/shadowaead/protocol.go
View file

@ -27,12 +27,7 @@ var List = []string{
"xchacha20-ietf-poly1305",
}
var (
ErrBadKey = E.New("shadowsocks: bad key")
ErrMissingPassword = E.New("shadowsocks: missing password")
)
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,
@ -65,11 +60,11 @@ func New(method string, key []byte, password []byte, secureRNG io.Reader) (shado
if len(key) == m.keySaltLength {
m.key = key
} else if len(key) > 0 {
return nil, ErrBadKey
} else if len(password) > 0 {
m.key = shadowsocks.Key(password, m.keySaltLength)
return nil, shadowsocks.ErrBadKey
} else if password == "" {
return nil, shadowsocks.ErrMissingPassword
} else {
return nil, ErrMissingPassword
m.key = shadowsocks.Key([]byte(password), m.keySaltLength)
}
return m, nil
}
@ -181,12 +176,10 @@ func (m *Method) DecodePacket(buffer *buf.Buffer) error {
type clientConn struct {
net.Conn
method *Method
destination M.Socksaddr
reader *Reader
writer *Writer
reader *Reader
writer *Writer
}
func (c *clientConn) writeRequest(payload []byte) error {