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

Fixes

Browse source
This commit is contained in:
世界 2022-04-16 18:03:58 +08:00
parent 12408d60a0
commit 12e645e9d2
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 121 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

23
protocol/shadowsocks/shadowaead_2022/protocol.go
View file

@ -35,7 +35,18 @@ const (
PacketNonceSize = 24
MinRequestHeaderSize = 1 + 8
MinResponseHeaderSize = MinRequestHeaderSize + KeySaltSize
MaxPacketSize = 64 * 1024
MaxPacketSize = 65535 + shadowaead.PacketLengthBufferSize + nonceSize*2
)
const (
// crypto/cipher.gcmStandardNonceSize
// golang.org/x/crypto/chacha20poly1305.NonceSize
nonceSize = 12
// Overhead
// crypto/cipher.gcmTagSize
// golang.org/x/crypto/chacha20poly1305.Overhead
overhead = 16
)
var (
@ -83,10 +94,10 @@ func New(method string, psk []byte, secureRNG io.Reader) (shadowsocks.Method, er
}
func Blake3DeriveKey(secret, salt []byte, keyLength int) []byte {
sessionKey := make([]byte, len(secret)+len(salt))
sessionKey := make([]byte, 2*KeySaltSize)
copy(sessionKey, secret)
copy(sessionKey[len(secret):], salt)
outKey := make([]byte, keyLength)
outKey := buf.Make(keyLength)
blake3.DeriveKey(outKey, "shadowsocks 2022 session subkey", sessionKey)
return outKey
}
@ -249,7 +260,8 @@ func (c *clientConn) readResponse() error {
return nil
}
salt := make([]byte, KeySaltSize)
_salt := make([]byte, KeySaltSize)
salt := common.Dup(_salt)
_, err := io.ReadFull(c.Conn, salt)
if err != nil {
return err
@ -282,7 +294,8 @@ func (c *clientConn) readResponse() error {
return ErrBadTimestamp
}
requestSalt := make([]byte, KeySaltSize)
_requestSalt := make([]byte, KeySaltSize)
requestSalt := common.Dup(_requestSalt)
_, err = io.ReadFull(reader, requestSalt)
if err != nil {
return err