history-museum/clash
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: use protobytes replace most of bytes.Buffer

Browse Source
This commit is contained in:
Dreamacro
2023-04-17 14:08:39 +08:00
parent df61a586c9
commit b7aade5e11
15 changed files with 244 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
transport/simple-obfs/tls.go
View File

@ -1,7 +1,6 @@
package obfs
import (
"bytes"
"crypto/rand"
"encoding/binary"
"io"
@ -9,6 +8,8 @@ import (
"time"
"github.com/Dreamacro/clash/common/pool"
"github.com/Dreamacro/protobytes"
)
const (
@ -99,11 +100,11 @@ func (to *TLSObfs) write(b []byte) (int, error) {
return len(b), err
}
buf := pool.GetBuffer()
defer pool.PutBuffer(buf)
buf.Write([]byte{0x17, 0x03, 0x03})
binary.Write(buf, binary.BigEndian, uint16(len(b)))
buf.Write(b)
buf := pool.GetBytesBuffer()
defer pool.PutBytesBuffer(buf)
buf.PutSlice([]byte{0x17, 0x03, 0x03})
buf.PutUint16be(uint16(len(b)))
buf.PutSlice(b)
_, err := to.Conn.Write(buf.Bytes())
return len(b), err
}
@ -119,35 +120,29 @@ func NewTLSObfs(conn net.Conn, server string) net.Conn {
}
func makeClientHelloMsg(data []byte, server string) []byte {
random := make([]byte, 28)
sessionID := make([]byte, 32)
rand.Read(random)
rand.Read(sessionID)
buf := &bytes.Buffer{}
buf := protobytes.BytesWriter{}
// handshake, TLS 1.0 version, length
buf.WriteByte(22)
buf.Write([]byte{0x03, 0x01})
buf.PutUint8(22)
buf.PutSlice([]byte{0x03, 0x01})
length := uint16(212 + len(data) + len(server))
buf.WriteByte(byte(length >> 8))
buf.WriteByte(byte(length & 0xff))
buf.PutUint16be(length)
// clientHello, length, TLS 1.2 version
buf.WriteByte(1)
buf.WriteByte(0)
binary.Write(buf, binary.BigEndian, uint16(208+len(data)+len(server)))
buf.Write([]byte{0x03, 0x03})
buf.PutUint8(1)
buf.PutUint8(0)
buf.PutUint16be(uint16(208 + len(data) + len(server)))
buf.PutSlice([]byte{0x03, 0x03})
// random with timestamp, sid len, sid
binary.Write(buf, binary.BigEndian, uint32(time.Now().Unix()))
buf.Write(random)
buf.WriteByte(32)
buf.Write(sessionID)
buf.PutUint32be(uint32(time.Now().Unix()))
buf.ReadFull(rand.Reader, 28)
buf.PutUint8(32)
buf.ReadFull(rand.Reader, 32)
// cipher suites
buf.Write([]byte{0x00, 0x38})
buf.Write([]byte{
buf.PutSlice([]byte{0x00, 0x38})
buf.PutSlice([]byte{
0xc0, 0x2c, 0xc0, 0x30, 0x00, 0x9f, 0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x2b, 0xc0, 0x2f,
0x00, 0x9e, 0xc0, 0x24, 0xc0, 0x28, 0x00, 0x6b, 0xc0, 0x23, 0xc0, 0x27, 0x00, 0x67, 0xc0, 0x0a,
0xc0, 0x14, 0x00, 0x39, 0xc0, 0x09, 0xc0, 0x13, 0x00, 0x33, 0x00, 0x9d, 0x00, 0x9c, 0x00, 0x3d,
@ -155,42 +150,42 @@ func makeClientHelloMsg(data []byte, server string) []byte {
})
// compression
buf.Write([]byte{0x01, 0x00})
buf.PutSlice([]byte{0x01, 0x00})
// extension length
binary.Write(buf, binary.BigEndian, uint16(79+len(data)+len(server)))
buf.PutUint16be(uint16(79 + len(data) + len(server)))
// session ticket
buf.Write([]byte{0x00, 0x23})
binary.Write(buf, binary.BigEndian, uint16(len(data)))
buf.Write(data)
buf.PutSlice([]byte{0x00, 0x23})
buf.PutUint16be(uint16(len(data)))
buf.PutSlice(data)
// server name
buf.Write([]byte{0x00, 0x00})
binary.Write(buf, binary.BigEndian, uint16(len(server)+5))
binary.Write(buf, binary.BigEndian, uint16(len(server)+3))
buf.WriteByte(0)
binary.Write(buf, binary.BigEndian, uint16(len(server)))
buf.Write([]byte(server))
buf.PutSlice([]byte{0x00, 0x00})
buf.PutUint16be(uint16(len(server) + 5))
buf.PutUint16be(uint16(len(server) + 3))
buf.PutUint8(0)
buf.PutUint16be(uint16(len(server)))
buf.PutSlice([]byte(server))
// ec_point
buf.Write([]byte{0x00, 0x0b, 0x00, 0x04, 0x03, 0x01, 0x00, 0x02})
buf.PutSlice([]byte{0x00, 0x0b, 0x00, 0x04, 0x03, 0x01, 0x00, 0x02})
// groups
buf.Write([]byte{0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x19, 0x00, 0x18})
buf.PutSlice([]byte{0x00, 0x0a, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x19, 0x00, 0x18})
// signature
buf.Write([]byte{
buf.PutSlice([]byte{
0x00, 0x0d, 0x00, 0x20, 0x00, 0x1e, 0x06, 0x01, 0x06, 0x02, 0x06, 0x03, 0x05,
0x01, 0x05, 0x02, 0x05, 0x03, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0x03, 0x01,
0x03, 0x02, 0x03, 0x03, 0x02, 0x01, 0x02, 0x02, 0x02, 0x03,
})
// encrypt then mac
buf.Write([]byte{0x00, 0x16, 0x00, 0x00})
buf.PutSlice([]byte{0x00, 0x16, 0x00, 0x00})
// extended master secret
buf.Write([]byte{0x00, 0x17, 0x00, 0x00})
buf.PutSlice([]byte{0x00, 0x17, 0x00, 0x00})
return buf.Bytes()
}