SagerNet/sing-shadowtls
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-shadowtls.git synced 2025-04-02 19:57:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hmac not locked

Browse source
This commit is contained in:
世界 2024-11-17 14:50:55 +08:00
parent fe94df5baf
commit e0563e5a51
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
v3_conn.go
View file

@ -7,6 +7,7 @@ import (
"hash" "hash"
"io" "io"
"net" "net"
"sync"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
@ -19,11 +20,11 @@ type verifiedConn struct {
net.Conn net.Conn
writer N.ExtendedWriter writer N.ExtendedWriter
vectorisedWriter N.VectorisedWriter vectorisedWriter N.VectorisedWriter
access sync.Mutex
hmacAdd hash.Hash hmacAdd hash.Hash
hmacVerify hash.Hash hmacVerify hash.Hash
hmacIgnore hash.Hash hmacIgnore hash.Hash
buffer *buf.Buffer
buffer *buf.Buffer
} }
func newVerifiedConn( func newVerifiedConn(
@ -119,9 +120,11 @@ func (c *verifiedConn) write(p []byte) (n int, err error) {
header[1] = 3 header[1] = 3
header[2] = 3 header[2] = 3
binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(len(p))) binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(len(p)))
c.access.Lock()
c.hmacAdd.Write(p) c.hmacAdd.Write(p)
hmacHash := c.hmacAdd.Sum(nil)[:hmacSize] hmacHash := c.hmacAdd.Sum(nil)[:hmacSize]
c.hmacAdd.Write(hmacHash) c.hmacAdd.Write(hmacHash)
c.access.Unlock()
copy(header[tlsHeaderSize:], hmacHash) copy(header[tlsHeaderSize:], hmacHash)
_, err = bufio.WriteVectorised(c.vectorisedWriter, [][]byte{header[:], p}) _, err = bufio.WriteVectorised(c.vectorisedWriter, [][]byte{header[:], p})
if err == nil { if err == nil {
@ -131,6 +134,7 @@ func (c *verifiedConn) write(p []byte) (n int, err error) {
} }
func (c *verifiedConn) WriteBuffer(buffer *buf.Buffer) error { func (c *verifiedConn) WriteBuffer(buffer *buf.Buffer) error {
c.access.Lock()
c.hmacAdd.Write(buffer.Bytes()) c.hmacAdd.Write(buffer.Bytes())
dateLen := buffer.Len() dateLen := buffer.Len()
header := buffer.ExtendHeader(tlsHmacHeaderSize) header := buffer.ExtendHeader(tlsHmacHeaderSize)
@ -140,6 +144,7 @@ func (c *verifiedConn) WriteBuffer(buffer *buf.Buffer) error {
binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(dateLen)) binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(dateLen))
hmacHash := c.hmacAdd.Sum(nil)[:hmacSize] hmacHash := c.hmacAdd.Sum(nil)[:hmacSize]
c.hmacAdd.Write(hmacHash) c.hmacAdd.Write(hmacHash)
c.access.Unlock()
copy(header[tlsHeaderSize:], hmacHash) copy(header[tlsHeaderSize:], hmacHash)
return c.writer.WriteBuffer(buffer) return c.writer.WriteBuffer(buffer)
} }
@ -150,11 +155,14 @@ func (c *verifiedConn) WriteVectorised(buffers []*buf.Buffer) error {
header[1] = 3 header[1] = 3
header[2] = 3 header[2] = 3
binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(buf.LenMulti(buffers))) binary.BigEndian.PutUint16(header[3:tlsHeaderSize], hmacSize+uint16(buf.LenMulti(buffers)))
c.access.Lock()
for _, buffer := range buffers { for _, buffer := range buffers {
c.hmacAdd.Write(buffer.Bytes()) c.hmacAdd.Write(buffer.Bytes())
} }
c.hmacAdd.Write(c.hmacAdd.Sum(nil)[:hmacSize]) c.hmacAdd.Write(c.hmacAdd.Sum(nil)[:hmacSize])
copy(header[tlsHeaderSize:], c.hmacAdd.Sum(nil)[:hmacSize]) hmacHash := c.hmacAdd.Sum(nil)[:hmacSize]
c.access.Unlock()
copy(header[tlsHeaderSize:], hmacHash)
return c.vectorisedWriter.WriteVectorised(append([]*buf.Buffer{buf.As(header[:])}, buffers...)) return c.vectorisedWriter.WriteVectorised(append([]*buf.Buffer{buf.As(header[:])}, buffers...))
} }