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

Update vendored github.com/Psiphon-Labs/tls-tris

Rod Hynes 7 лет назад
Родитель
Сommit
b8aa89bcf4

+ 6 - 5
vendor/github.com/Psiphon-Labs/tls-tris/handshake_messages.go

@@ -459,6 +459,9 @@ func (m *clientHelloMsg) marshal() []byte {
 // are shuffled, certain extensions may be omitted, and some additional
 // extensions may be added in.
 //
+// Assumes the Config is using default values for ClientHello algorithm
+// configuration.
+//
 // Inspired by parrotRandomized in utls:
 // https://github.com/refraction-networking/utls/blob/db1b65d2300d3a59616a43d2df4ea556b4a7d277/u_parrots.go#L300
 func (m *clientHelloMsg) randomizedMarshal() []byte {
@@ -518,11 +521,9 @@ func (m *clientHelloMsg) randomizedMarshal() []byte {
 			func(i int) { m.cipherSuites = m.cipherSuites[:numTLS13CipherSuites+i] })
 	}
 
-	permute(
-		len(m.supportedCurves),
-		func(i, j int) {
-			m.supportedCurves[i], m.supportedCurves[j] = m.supportedCurves[j], m.supportedCurves[i]
-		})
+	// Following utls, the supported curves extension order is preserved. Note
+	// that, in TLS 1.3, the key share extention will include an entry
+	// corresponding to the first, default curve.
 	truncate(
 		len(m.supportedCurves),
 		func(i int) { m.supportedCurves = m.supportedCurves[:i] })

+ 3 - 3
vendor/vendor.json

@@ -57,10 +57,10 @@
 			"revisionTime": "2018-04-26T17:24:40Z"
 		},
 		{
-			"checksumSHA1": "dNsok0tfyatNVVcK1tdGQAPvOFI=",
+			"checksumSHA1": "4D0uWGD7eh1gaAaB1zTlgBze3TA=",
 			"path": "github.com/Psiphon-Labs/tls-tris",
-			"revision": "5cce86280f391cc1c66f19f60b6e53b5b3c56f3b",
-			"revisionTime": "2018-08-30T17:38:46Z"
+			"revision": "e86122f81b5bc600a8eb71df8c669822c91a180b",
+			"revisionTime": "2018-09-05T17:24:49Z"
 		},
 		{
 			"checksumSHA1": "OBN3dfn0yx9L3I2RPo58o27my2k=",