Update vendored quic-go

- Use chacha20 fork with 2^32-1 counter value fix
Psiphon-Labs · Jan 28, 2020 · 178f4b6 · 178f4b6
1 parent d39c1a8
commit 178f4b6
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 27 deletions.
diff --git a/...hub.com/marten-seemann/chacha20/README.md → ...ithub.com/Psiphon-Labs/chacha20/README.md b/...hub.com/marten-seemann/chacha20/README.md → ...ithub.com/Psiphon-Labs/chacha20/README.md
diff --git a/...b.com/marten-seemann/chacha20/asm_arm64.s → ...hub.com/Psiphon-Labs/chacha20/asm_arm64.s b/...b.com/marten-seemann/chacha20/asm_arm64.s → ...hub.com/Psiphon-Labs/chacha20/asm_arm64.s
diff --git a/...com/marten-seemann/chacha20/asm_ppc64le.s → ...b.com/Psiphon-Labs/chacha20/asm_ppc64le.s b/...com/marten-seemann/chacha20/asm_ppc64le.s → ...b.com/Psiphon-Labs/chacha20/asm_ppc64le.s
diff --git a/...m/marten-seemann/chacha20/chacha_arm64.go → ...com/Psiphon-Labs/chacha20/chacha_arm64.go b/...m/marten-seemann/chacha20/chacha_arm64.go → ...com/Psiphon-Labs/chacha20/chacha_arm64.go
diff --git a/...marten-seemann/chacha20/chacha_generic.go → ...m/Psiphon-Labs/chacha20/chacha_generic.go b/...marten-seemann/chacha20/chacha_generic.go → ...m/Psiphon-Labs/chacha20/chacha_generic.go
diff --git a/...m/marten-seemann/chacha20/chacha_noasm.go → ...com/Psiphon-Labs/chacha20/chacha_noasm.go b/...m/marten-seemann/chacha20/chacha_noasm.go → ...com/Psiphon-Labs/chacha20/chacha_noasm.go
diff --git a/...marten-seemann/chacha20/chacha_ppc64le.go → ...m/Psiphon-Labs/chacha20/chacha_ppc64le.go b/...marten-seemann/chacha20/chacha_ppc64le.go → ...m/Psiphon-Labs/chacha20/chacha_ppc64le.go
diff --git a/...m/marten-seemann/chacha20/chacha_s390x.go → ...com/Psiphon-Labs/chacha20/chacha_s390x.go b/...m/marten-seemann/chacha20/chacha_s390x.go → ...com/Psiphon-Labs/chacha20/chacha_s390x.go
diff --git a/...om/marten-seemann/chacha20/chacha_s390x.s → ....com/Psiphon-Labs/chacha20/chacha_s390x.s b/...om/marten-seemann/chacha20/chacha_s390x.s → ....com/Psiphon-Labs/chacha20/chacha_s390x.s
diff --git a/...mann/chacha20/internal/subtle/aliasing.go → ...Labs/chacha20/internal/subtle/aliasing.go b/...mann/chacha20/internal/subtle/aliasing.go → ...Labs/chacha20/internal/subtle/aliasing.go
diff --git a/...a20/internal/subtle/aliasing_appengine.go → ...a20/internal/subtle/aliasing_appengine.go b/...a20/internal/subtle/aliasing_appengine.go → ...a20/internal/subtle/aliasing_appengine.go
diff --git a/...github.com/marten-seemann/chacha20/xor.go → ...r/github.com/Psiphon-Labs/chacha20/xor.go b/...github.com/marten-seemann/chacha20/xor.go → ...r/github.com/Psiphon-Labs/chacha20/xor.go
diff --git a/vendor/github.com/Psiphon-Labs/quic-go/internal/handshake/header_protector.go b/vendor/github.com/Psiphon-Labs/quic-go/internal/handshake/header_protector.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -20,6 +20,18 @@
 			"revision": "94750aa2185e6ee4217105064949acace0156564",
 			"revisionTime": "2019-07-31T17:17:12Z"
 		},
+		{
+			"checksumSHA1": "C5OwxfDa6nvLoxP3WBaCp7ufW60=",
+			"path": "github.com/Psiphon-Labs/chacha20",
+			"revision": "899a4be528633ecf678f45e4f6b177d0f89b9e7c",
+			"revisionTime": "2020-01-28T19:13:10Z"
+		},
+		{
+			"checksumSHA1": "zNTA9RmD/BcIWRfZWF/DIhULpK0=",
+			"path": "github.com/Psiphon-Labs/chacha20/internal/subtle",
+			"revision": "899a4be528633ecf678f45e4f6b177d0f89b9e7c",
+			"revisionTime": "2020-01-28T19:13:10Z"
+		},
 		{
 			"checksumSHA1": "d3DwsdacdFn1/KCG/2uPV1PwR3s=",
 			"path": "github.com/Psiphon-Labs/dns",
@@ -65,8 +77,8 @@
 		{
 			"checksumSHA1": "8MdwAjQlha5clFXwY1ayF4vNGAQ=",
 			"path": "github.com/Psiphon-Labs/quic-go",
-			"revision": "abf539ac596a6017b6eb8904f7342da8daab8df1",
-			"revisionTime": "2020-01-16T02:28:06Z"
+			"revision": "738e15bfe6c3d7a0ccc91e2f237e5554ab6a35a6",
+			"revisionTime": "2020-01-28T19:39:28Z"
 		},
 		{
 			"checksumSHA1": "VMJLFpeoJ56PTQxR0wEkkiQTr1s=",
@@ -340,22 +352,6 @@
 			"revision": "ae77be60afb1dcacde03767a8c37337fad28ac14",
 			"revisionTime": "2017-05-10T13:15:34Z"
 		},
-		{
-			"checksumSHA1": "j4eMhpVKh7QbPBE/vZL+VxQwJT0=",
-			"path": "github.com/marten-seemann/chacha20",
-			"revision": "36564989294fee5f3957d3e3fbfc655e10786ec0",
-			"revisionTime": "2019-09-06T10:21:14Z",
-			"version": "v0.2.0",
-			"versionExact": "v0.2.0"
-		},
-		{
-			"checksumSHA1": "xJ/ZPgaoP3Gd5ETWGhqufsqptuw=",
-			"path": "github.com/marten-seemann/chacha20/internal/subtle",
-			"revision": "36564989294fee5f3957d3e3fbfc655e10786ec0",
-			"revisionTime": "2019-09-06T10:21:14Z",
-			"version": "v0.2.0",
-			"versionExact": "v0.2.0"
-		},
 		{
 			"checksumSHA1": "Urc++6mqm/jcr3SSL/MMN5v7Owk=",
 			"path": "github.com/marten-seemann/qpack",