Просмотр исходного кода

Updated QUIC Destination Connection ID length

Amir Khan 2 лет назад
Родитель
Сommit
70409639f7

+ 1 - 1
go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20210303140923-464a7a37606e
 	github.com/Psiphon-Labs/bolt v0.0.0-20200624191537-23cedaef7ad7
 	github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464
-	github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5
+	github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b
 	github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad
 	github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f
 	github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61

+ 4 - 0
go.sum

@@ -16,6 +16,10 @@ github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf h1:bGS+Wx
 github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf/go.mod h1:wUiSd0qyefymNlikc99B2rRC01YPN1uUvDMytMOGmF8=
 github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5 h1:r0/f9ztI1KygYgkyXmKCtzGXEV3J2Dfl1d6vRHzftig=
 github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230614192914-1a4b04988030 h1:MSlNdUKy1zZtkYSgm/p2v3B6+AKxWbPzFTZjRi1yiGg=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230614192914-1a4b04988030/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b h1:CP226ehTcuzIZRLpKxVd3TZhwh9iOlKa5co7pnrobFM=
+github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b/go.mod h1:wTIxqsKVrEQIxVIIYOEHuscY+PM3h6Wz79u5aF60fo0=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad h1:m6HS84+b5xDPLj7D/ya1CeixyaHOCZoMbBilJ48y+Ts=
 github.com/Psiphon-Labs/tls-tris v0.0.0-20210713133851-676a693d51ad/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE=
 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=

+ 2 - 7
vendor/github.com/Psiphon-Labs/quic-go/internal/protocol/connection_id.go

@@ -57,15 +57,10 @@ func ParseConnectionID(b []byte) ConnectionID {
 	return c
 }
 
+// [Psiphon]
 // GenerateConnectionIDForInitial generates a connection ID for the Initial packet.
-// It uses a length randomly chosen between 8 and 20 bytes.
 func GenerateConnectionIDForInitial() (ConnectionID, error) {
-	r := make([]byte, 1)
-	if _, err := rand.Read(r); err != nil {
-		return ConnectionID{}, err
-	}
-	l := MinConnectionIDLenInitial + int(r[0])%(maxConnectionIDLen-MinConnectionIDLenInitial+1)
-	return GenerateConnectionID(l)
+	return GenerateConnectionID(MinConnectionIDLenInitial)
 }
 
 // ReadConnectionID reads a connection ID of length len from the given io.Reader.

+ 1 - 1
vendor/modules.txt

@@ -22,7 +22,7 @@ github.com/Psiphon-Labs/qtls-go1-19
 # github.com/Psiphon-Labs/qtls-go1-20 v0.0.0-20230608214729-dd57d6787acf
 ## explicit; go 1.20
 github.com/Psiphon-Labs/qtls-go1-20
-# github.com/Psiphon-Labs/quic-go v0.0.0-20230608212323-c51576c9a3d5
+# github.com/Psiphon-Labs/quic-go v0.0.0-20230614195241-44655521e44b
 ## explicit; go 1.19
 github.com/Psiphon-Labs/quic-go
 github.com/Psiphon-Labs/quic-go/http3