Update vendored quic-go and qtls

vendor/github.com/marten-seemann/qtls-go1-15/common.go → vendor/github.com/Psiphon-Labs/qtls-go1-15/common.go

@@ -350,7 +350,7 @@ type clientSessionState struct {
 // goroutines. Up to TLS 1.2, only ticket-based resumption is supported, not
 // SessionID-based resumption. In TLS 1.3 they were merged into PSK modes, which
 // are supported via this interface.
-//go:generate sh -c "mockgen -package qtls -destination mock_client_session_cache_test.go github.com/marten-seemann/qtls-go1-15 ClientSessionCache"
+//go:generate sh -c "mockgen -package qtls -destination mock_client_session_cache_test.go github.com/Psiphon-Labs/qtls-go1-15 ClientSessionCache"
 type ClientSessionCache = tls.ClientSessionCache
 
 // SignatureScheme is a tls.SignatureScheme

vendor/github.com/marten-seemann/qtls-go1-15/go.mod → vendor/github.com/Psiphon-Labs/qtls-go1-15/go.mod

@@ -1,4 +1,4 @@
-module github.com/marten-seemann/qtls-go1-15
+module github.com/Psiphon-Labs/qtls-go1-15
 
 go 1.15
 

vendor/github.com/marten-seemann/qtls/common.go → vendor/github.com/Psiphon-Labs/qtls/common.go

@@ -301,7 +301,7 @@ type ClientSessionState struct {
 // goroutines. Up to TLS 1.2, only ticket-based resumption is supported, not
 // SessionID-based resumption. In TLS 1.3 they were merged into PSK modes, which
 // are supported via this interface.
-//go:generate sh -c "mockgen -package qtls -self_package github.com/marten-seemann/qtls -destination mock_client_session_cache_test.go github.com/marten-seemann/qtls ClientSessionCache"
+//go:generate sh -c "mockgen -package qtls -self_package github.com/Psiphon-Labs/qtls -destination mock_client_session_cache_test.go github.com/Psiphon-Labs/qtls ClientSessionCache"
 type ClientSessionCache interface {
 	// Get searches for a ClientSessionState associated with the given key.
 	// On return, ok is true if one was found.

vendor/github.com/marten-seemann/qtls/go.mod → vendor/github.com/Psiphon-Labs/qtls/go.mod

@@ -1,4 +1,4 @@
-module github.com/marten-seemann/qtls
+module github.com/Psiphon-Labs/qtls
 
 go 1.14
 

vendor/github.com/Psiphon-Labs/quic-go/go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/golang/mock v1.4.4
 	github.com/golang/protobuf v1.4.2
 	github.com/marten-seemann/qpack v0.2.1
-	github.com/marten-seemann/qtls v0.10.0
-	github.com/marten-seemann/qtls-go1-15 v0.1.1
+	github.com/Psiphon-Labs/qtls v0.10.0
+	github.com/Psiphon-Labs/qtls-go1-15 v0.1.1
 	github.com/onsi/ginkgo v1.14.0
 	github.com/onsi/gomega v1.10.1
 	go.opencensus.io v0.22.2

vendor/github.com/Psiphon-Labs/quic-go/go.sum

@@ -85,10 +85,10 @@ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
 github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
-github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
-github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
-github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ=
-github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
+github.com/Psiphon-Labs/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
+github.com/Psiphon-Labs/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
+github.com/Psiphon-Labs/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ=
+github.com/Psiphon-Labs/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=

vendor/github.com/Psiphon-Labs/quic-go/internal/qtls/go114.go

@@ -10,7 +10,7 @@ import (
 	"unsafe"
 
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/prng"
-	"github.com/marten-seemann/qtls"
+	"github.com/Psiphon-Labs/qtls"
 )
 
 type (
@@ -174,7 +174,7 @@ type cipherSuiteTLS13 struct {
 	Hash   crypto.Hash
 }
 
-//go:linkname cipherSuiteTLS13ByID github.com/marten-seemann/qtls.cipherSuiteTLS13ByID
+//go:linkname cipherSuiteTLS13ByID github.com/Psiphon-Labs/qtls.cipherSuiteTLS13ByID
 func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13
 
 // CipherSuiteTLS13ByID gets a TLS 1.3 cipher suite.

vendor/github.com/Psiphon-Labs/quic-go/internal/qtls/go115.go

@@ -9,7 +9,7 @@ import (
 	"net"
 	"unsafe"
 
-	qtls "github.com/marten-seemann/qtls-go1-15"
+	qtls "github.com/Psiphon-Labs/qtls-go1-15"
 )
 
 type (
@@ -98,7 +98,7 @@ type cipherSuiteTLS13 struct {
 	Hash   crypto.Hash
 }
 
-//go:linkname cipherSuiteTLS13ByID github.com/marten-seemann/qtls-go1-15.cipherSuiteTLS13ByID
+//go:linkname cipherSuiteTLS13ByID github.com/Psiphon-Labs/qtls-go1-15.cipherSuiteTLS13ByID
 func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13
 
 // CipherSuiteTLS13ByID gets a TLS 1.3 cipher suite.

vendor/vendor.json

@@ -63,94 +63,106 @@
 			"revisionTime": "2019-12-04T18:36:04Z"
 		},
 		{
-			"checksumSHA1": "/eBUPgTc9Ql15oGglSxjIaLpS5A=",
+			"checksumSHA1": "2iy6aXBJutaq420vFiVo1zMIoL0=",
+			"path": "github.com/Psiphon-Labs/qtls",
+			"revision": "17cd2308c9f2daa5ccae7e2b6333cb155a0e48c8",
+			"revisionTime": "2021-01-22T18:39:06Z"
+		},
+		{
+			"checksumSHA1": "YWb8OQ1ywZdM1oMwCiCPVyOprPI=",
+			"path": "github.com/Psiphon-Labs/qtls-go1-15",
+			"revision": "84e2f3807a5344089390d18e64dd7c5148cfd57e",
+			"revisionTime": "2021-01-22T18:37:27Z"
+		},
+		{
+			"checksumSHA1": "F+phd7pR0XrnOZTRiuPFDmjnVHc=",
 			"path": "github.com/Psiphon-Labs/quic-go",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "I7ksrXW08I/9ILniHWq7HaZmKzw=",
 			"path": "github.com/Psiphon-Labs/quic-go/http3",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "ambpP2sKCBYvSzh44FVpQ6pYwZ8=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/ackhandler",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "WCg7hgtQJK0DnRDIEMr2YfPp4wk=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/congestion",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "9GXkZrLquGYM01PwaX6MP08xGuQ=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/flowcontrol",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
-			"checksumSHA1": "/woCa9iNDYaG0uEo1FAOsblsd5Y=",
+			"checksumSHA1": "bLK9yR03Z3mvRiydsAvwL+3PHUo=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/handshake",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "/r6Ozpkx2VLJ8JoqyOM1bUZy0v8=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/logutils",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "CIDoN88aThNKa4KvjzkZRIerXag=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/protocol",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "lhu4Lr4fSeZZO1myoFfcTOkCgV4=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/qerr",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
-			"checksumSHA1": "ske0BJIybzKin07P0tRj37dEkHk=",
+			"checksumSHA1": "LGlWv3IeLOxqtbKOXbup2pA/VNI=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/qtls",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "mXT+EXkTcZheIzM/len7KpQLVnU=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/utils",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
-			"checksumSHA1": "F5NruavAqKXVwLiKfBG+ufXIC6M=",
+			"checksumSHA1": "PcxaWchdMYF3/YzZpp8Q4DwvZ6E=",
 			"path": "github.com/Psiphon-Labs/quic-go/internal/wire",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "/59zrlheA3LrtXasYja/eiqHdEc=",
 			"path": "github.com/Psiphon-Labs/quic-go/logging",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "fDKLR1SlCjRzEYN43depFkyeOoU=",
 			"path": "github.com/Psiphon-Labs/quic-go/quictrace",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "SKs8m23QDphWNaZNDhVrprkJFpg=",
 			"path": "github.com/Psiphon-Labs/quic-go/quictrace/pb",
-			"revision": "82f9bc8be76dee83b53e61f18b5cf14311f7d05e",
-			"revisionTime": "2021-01-15T21:18:48Z"
+			"revision": "890e2cbbf0465e22385daee782056a5458d1ec9a",
+			"revisionTime": "2021-01-22T18:43:14Z"
 		},
 		{
 			"checksumSHA1": "udq1ER8m9FUb3+G39Li2Q3bBi7g=",
@@ -414,22 +426,6 @@
 			"version": "v0.2.1",
 			"versionExact": "v0.2.1"
 		},
-		{
-			"checksumSHA1": "6iYa4sHxShmhnDRem8oxYaXdzQU=",
-			"path": "github.com/marten-seemann/qtls",
-			"revision": "9ec27f35079121f582027b96cc363817b67d7666",
-			"revisionTime": "2020-06-27T06:45:57Z",
-			"version": "v0.10.0",
-			"versionExact": "v0.10.0"
-		},
-		{
-			"checksumSHA1": "MwI0Ni0oRNS9I2CpeWU3X8Tx1cA=",
-			"path": "github.com/marten-seemann/qtls-go1-15",
-			"revision": "e2848f7418080d3f0e81e80909a25b5e6a23c388",
-			"revisionTime": "2020-08-20T06:15:37Z",
-			"version": "v0.1.1",
-			"versionExact": "v0.1.1"
-		},
 		{
 			"checksumSHA1": "sY8sshVIEXnJgg3S6C5FcN33Vq4=",
 			"path": "github.com/marusama/semaphore",