Merge pull request #409 from dobsonj/CVE-2023-44487-origin-release-4.10

[release-4.10] OCPBUGS-21237: CVE-2023-44487: bump golang.org/x/net to v0.17.0
openshift · Oct 27, 2023 · a8a23fa · a8a23fa
2 parents 0ad6026 + 6889327
commit a8a23fa
Show file tree

Hide file tree

Showing 372 changed files with 63,490 additions and 14,962 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.44.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/spf13/cobra v1.2.1
-	golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
+	golang.org/x/net v0.17.0 // indirect
 	k8s.io/api v0.23.1
 	k8s.io/apiextensions-apiserver v0.23.0
 	k8s.io/apimachinery v0.23.1
@@ -85,12 +85,12 @@ 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.14.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect

diff --git a/go.sum b/go.sum
diff --git a/vendor/golang.org/x/crypto/AUTHORS b/vendor/golang.org/x/crypto/AUTHORS
diff --git a/vendor/golang.org/x/crypto/CONTRIBUTORS b/vendor/golang.org/x/crypto/CONTRIBUTORS
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/vendor/golang.org/x/crypto/cryptobyte/string.go b/vendor/golang.org/x/crypto/cryptobyte/string.go
diff --git a/....org/x/crypto/internal/subtle/aliasing.go → ...lang.org/x/crypto/internal/alias/alias.go b/....org/x/crypto/internal/subtle/aliasing.go → ...lang.org/x/crypto/internal/alias/alias.go
diff --git a/...crypto/internal/subtle/aliasing_purego.go → ...g/x/crypto/internal/alias/alias_purego.go b/...crypto/internal/subtle/aliasing_purego.go → ...g/x/crypto/internal/alias/alias_purego.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