Merge pull request #141 from shiftstack/CVE-2022-27191

Bug 2074274: Address CVE-2022-27191
openshift · Apr 13, 2022 · fb7d0b4 · fb7d0b4
2 parents a5f09a2 + f100c11
commit fb7d0b4
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -82,7 +82,7 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
 	golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect

diff --git a/go.sum b/go.sum
@@ -726,8 +726,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -817,6 +818,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs=
 golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

diff --git a/vendor/golang.org/x/crypto/cryptobyte/asn1.go b/vendor/golang.org/x/crypto/cryptobyte/asn1.go
diff --git a/vendor/golang.org/x/crypto/cryptobyte/builder.go b/vendor/golang.org/x/crypto/cryptobyte/builder.go
diff --git a/...lang.org/x/crypto/poly1305/bits_compat.go → ...x/crypto/internal/poly1305/bits_compat.go b/...lang.org/x/crypto/poly1305/bits_compat.go → ...x/crypto/internal/poly1305/bits_compat.go
diff --git a/...lang.org/x/crypto/poly1305/bits_go1.13.go → ...x/crypto/internal/poly1305/bits_go1.13.go b/...lang.org/x/crypto/poly1305/bits_go1.13.go → ...x/crypto/internal/poly1305/bits_go1.13.go
diff --git a/...golang.org/x/crypto/poly1305/mac_noasm.go → ...g/x/crypto/internal/poly1305/mac_noasm.go b/...golang.org/x/crypto/poly1305/mac_noasm.go → ...g/x/crypto/internal/poly1305/mac_noasm.go
diff --git a/.../golang.org/x/crypto/poly1305/poly1305.go → ...rg/x/crypto/internal/poly1305/poly1305.go b/.../golang.org/x/crypto/poly1305/poly1305.go → ...rg/x/crypto/internal/poly1305/poly1305.go
diff --git a/...golang.org/x/crypto/poly1305/sum_amd64.go → ...g/x/crypto/internal/poly1305/sum_amd64.go b/...golang.org/x/crypto/poly1305/sum_amd64.go → ...g/x/crypto/internal/poly1305/sum_amd64.go
diff --git a/.../golang.org/x/crypto/poly1305/sum_amd64.s → ...rg/x/crypto/internal/poly1305/sum_amd64.s b/.../golang.org/x/crypto/poly1305/sum_amd64.s → ...rg/x/crypto/internal/poly1305/sum_amd64.s
diff --git a/...lang.org/x/crypto/poly1305/sum_generic.go → ...x/crypto/internal/poly1305/sum_generic.go b/...lang.org/x/crypto/poly1305/sum_generic.go → ...x/crypto/internal/poly1305/sum_generic.go
diff --git a/...lang.org/x/crypto/poly1305/sum_ppc64le.go → ...x/crypto/internal/poly1305/sum_ppc64le.go b/...lang.org/x/crypto/poly1305/sum_ppc64le.go → ...x/crypto/internal/poly1305/sum_ppc64le.go
diff --git a/...olang.org/x/crypto/poly1305/sum_ppc64le.s → .../x/crypto/internal/poly1305/sum_ppc64le.s b/...olang.org/x/crypto/poly1305/sum_ppc64le.s → .../x/crypto/internal/poly1305/sum_ppc64le.s
diff --git a/...golang.org/x/crypto/poly1305/sum_s390x.go → ...g/x/crypto/internal/poly1305/sum_s390x.go b/...golang.org/x/crypto/poly1305/sum_s390x.go → ...g/x/crypto/internal/poly1305/sum_s390x.go
diff --git a/.../golang.org/x/crypto/poly1305/sum_s390x.s → ...rg/x/crypto/internal/poly1305/sum_s390x.s b/.../golang.org/x/crypto/poly1305/sum_s390x.s → ...rg/x/crypto/internal/poly1305/sum_s390x.s
diff --git a/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go b/vendor/golang.org/x/crypto/nacl/secretbox/secretbox.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -408,13 +408,13 @@ go.uber.org/zap/internal/color
 go.uber.org/zap/internal/exit
 go.uber.org/zap/zapcore
 go.uber.org/zap/zapgrpc
-# golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+# golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
 ## explicit; go 1.17
 golang.org/x/crypto/cryptobyte
 golang.org/x/crypto/cryptobyte/asn1
+golang.org/x/crypto/internal/poly1305
 golang.org/x/crypto/internal/subtle
 golang.org/x/crypto/nacl/secretbox
-golang.org/x/crypto/poly1305
 golang.org/x/crypto/salsa20/salsa
 # golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d
 ## explicit; go 1.17