chore: sync vless encryption code

wwqgtxx · wwqgtxx · commit 335d54e48886 · 2025-08-13T19:50:53.000+08:00
diff --git a/transport/vless/encryption/client.go b/transport/vless/encryption/client.go
@@ -114,18 +114,18 @@ func (i *ClientInstance) Handshake(conn net.Conn) (net.Conn, error) {
 		return nil, err
 	}
 	if t != 1 {
-		return nil, fmt.Errorf("unexpected type %v, expect server hello", t)
+		return nil, fmt.Errorf("unexpected type %v, expect random hello", t)
 	}
 
-	peerServerHello := make([]byte, 1088+21)
-	if l != len(peerServerHello) {
-		return nil, fmt.Errorf("unexpected length %v for server hello", l)
+	peerRandomHello := make([]byte, 1088+21)
+	if l != len(peerRandomHello) {
+		return nil, fmt.Errorf("unexpected length %v for random hello", l)
 	}
-	if _, err := io.ReadFull(c.Conn, peerServerHello); err != nil {
+	if _, err := io.ReadFull(c.Conn, peerRandomHello); err != nil {
 		return nil, err
 	}
-	encapsulatedPfsKey := peerServerHello[:1088]
-	c.ticket = peerServerHello[1088:]
+	encapsulatedPfsKey := peerRandomHello[:1088]
+	c.ticket = peerRandomHello[1088:]
 
 	pfsKey, err := pfsDKey.Decapsulate(encapsulatedPfsKey)
 	if err != nil {
diff --git a/transport/vless/encryption/doc.go b/transport/vless/encryption/doc.go
@@ -7,4 +7,5 @@
 // https://github.com/XTLS/Xray-core/commit/23d7aad461d232bc5bed52dd6aaa731ecd88ad35
 // https://github.com/XTLS/Xray-core/commit/3c20bddfcfd8999be5f9a2ac180dc959950e4c61
 // https://github.com/XTLS/Xray-core/commit/1720be168fa069332c418503d30341fc6e01df7f
+// https://github.com/XTLS/Xray-core/commit/0fd7691d6b28e05922d7a5a9313d97745a51ea63
 package encryption
diff --git a/transport/vless/encryption/server.go b/transport/vless/encryption/server.go
@@ -203,20 +203,17 @@ func (c *ServerConn) Read(b []byte) (int, error) {
 			if t != 0 {
 				return 0, fmt.Errorf("unexpected type %v, expect ticket hello", t)
 			}
-			peerTicket := make([]byte, 21)
-			if l != len(peerTicket) {
+			peerTicketHello := make([]byte, 21+32)
+			if l != len(peerTicketHello) {
 				return 0, fmt.Errorf("unexpected length %v for ticket hello", l)
 			}
-			if _, err := io.ReadFull(c.Conn, peerTicket); err != nil {
+			if _, err := io.ReadFull(c.Conn, peerTicketHello); err != nil {
 				return 0, err
 			}
-			if !bytes.Equal(peerTicket, c.ticket) {
+			if !bytes.Equal(peerTicketHello[:21], c.ticket) {
 				return 0, errors.New("naughty boy")
 			}
-			c.peerRandom = make([]byte, 32)
-			if _, err := io.ReadFull(c.Conn, c.peerRandom); err != nil {
-				return 0, err
-			}
+			c.peerRandom = peerTicketHello[21:]
 		}
 		c.peerAead = NewAead(c.cipher, c.baseKey, c.peerRandom, c.ticket)
 		c.peerNonce = make([]byte, 12)

Original file line number	Diff line number	Diff line change
`@@ -114,18 +114,18 @@ func (i *ClientInstance) Handshake(conn net.Conn) (net.Conn, error) {`
`114`	`114`	`return nil, err`
`115`	`115`	`}`
`116`	`116`	`if t != 1 {`
`117`		`- return nil, fmt.Errorf("unexpected type %v, expect server hello", t)`
	`117`	`+ return nil, fmt.Errorf("unexpected type %v, expect random hello", t)`
`118`	`118`	`}`
`119`	`119`
`120`		`- peerServerHello := make([]byte, 1088+21)`
`121`		`- if l != len(peerServerHello) {`
`122`		`- return nil, fmt.Errorf("unexpected length %v for server hello", l)`
	`120`	`+ peerRandomHello := make([]byte, 1088+21)`
	`121`	`+ if l != len(peerRandomHello) {`
	`122`	`+ return nil, fmt.Errorf("unexpected length %v for random hello", l)`
`123`	`123`	`}`
`124`		`- if _, err := io.ReadFull(c.Conn, peerServerHello); err != nil {`
	`124`	`+ if _, err := io.ReadFull(c.Conn, peerRandomHello); err != nil {`
`125`	`125`	`return nil, err`
`126`	`126`	`}`
`127`		`- encapsulatedPfsKey := peerServerHello[:1088]`
`128`		`- c.ticket = peerServerHello[1088:]`
	`127`	`+ encapsulatedPfsKey := peerRandomHello[:1088]`
	`128`	`+ c.ticket = peerRandomHello[1088:]`
`129`	`129`
`130`	`130`	`pfsKey, err := pfsDKey.Decapsulate(encapsulatedPfsKey)`
`131`	`131`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -203,20 +203,17 @@ func (c *ServerConn) Read(b []byte) (int, error) {`
`203`	`203`	`if t != 0 {`
`204`	`204`	`return 0, fmt.Errorf("unexpected type %v, expect ticket hello", t)`
`205`	`205`	`}`
`206`		`- peerTicket := make([]byte, 21)`
`207`		`- if l != len(peerTicket) {`
	`206`	`+ peerTicketHello := make([]byte, 21+32)`
	`207`	`+ if l != len(peerTicketHello) {`
`208`	`208`	`return 0, fmt.Errorf("unexpected length %v for ticket hello", l)`
`209`	`209`	`}`
`210`		`- if _, err := io.ReadFull(c.Conn, peerTicket); err != nil {`
	`210`	`+ if _, err := io.ReadFull(c.Conn, peerTicketHello); err != nil {`
`211`	`211`	`return 0, err`
`212`	`212`	`}`
`213`		`- if !bytes.Equal(peerTicket, c.ticket) {`
	`213`	`+ if !bytes.Equal(peerTicketHello[:21], c.ticket) {`
`214`	`214`	`return 0, errors.New("naughty boy")`
`215`	`215`	`}`
`216`		`- c.peerRandom = make([]byte, 32)`
`217`		`- if _, err := io.ReadFull(c.Conn, c.peerRandom); err != nil {`
`218`		`- return 0, err`
`219`		`- }`
	`216`	`+ c.peerRandom = peerTicketHello[21:]`
`220`	`217`	`}`
`221`	`218`	`c.peerAead = NewAead(c.cipher, c.baseKey, c.peerRandom, c.ticket)`
`222`	`219`	`c.peerNonce = make([]byte, 12)`