Skip to content

Commit 6c7db6f

Browse files
[release-1.11] Bump ocicrypt and go-jose CVE-2024-28180
Bump github.com/go-jose/go-jose to v3.0.0 and github.com/containers/ocicrypt to v1.1.10 Addresses: CVE-2024-28180 https://issues.redhat.com/browse/OCPBUGS-30789 https://issues.redhat.com/browse/OCPBUGS-30790 https://issues.redhat.com/browse/OCPBUGS-30791 Signed-off-by: tomsweeneyredhat <[email protected]>
1 parent df2b9ae commit 6c7db6f

File tree

553 files changed

+28312
-13564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

553 files changed

+28312
-13564
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ test-unit-local: bin/skopeo
248248
$(GO) test $(MOD_VENDOR) -tags "$(BUILDTAGS)" $$($(GO) list $(MOD_VENDOR) -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$')
249249

250250
vendor:
251-
$(GO) mod tidy
251+
$(GO) mod tidy -compat=1.17
252252
$(GO) mod vendor
253253
$(GO) mod verify
254254

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.17
55
require (
66
github.com/containers/common v0.51.0
77
github.com/containers/image/v5 v5.24.1
8-
github.com/containers/ocicrypt v1.1.7
8+
github.com/containers/ocicrypt v1.1.10
99
github.com/containers/storage v1.45.3
1010
github.com/docker/distribution v2.8.1+incompatible
1111
github.com/opencontainers/go-digest v1.0.0
@@ -16,7 +16,7 @@ require (
1616
github.com/spf13/pflag v1.0.5
1717
github.com/stretchr/testify v1.8.1
1818
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
19-
golang.org/x/term v0.5.0
19+
golang.org/x/term v0.17.0
2020
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
2121
gopkg.in/yaml.v2 v2.4.0
2222
)
@@ -41,7 +41,7 @@ require (
4141
github.com/docker/go-units v0.5.0 // indirect
4242
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4343
github.com/ghodss/yaml v1.0.0 // indirect
44-
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
44+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
4545
github.com/go-openapi/analysis v0.21.4 // indirect
4646
github.com/go-openapi/errors v0.20.3 // indirect
4747
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/go-playground/validator/v10 v10.11.1 // indirect
5858
github.com/gogo/protobuf v1.3.2 // indirect
5959
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60-
github.com/golang/protobuf v1.5.2 // indirect
60+
github.com/golang/protobuf v1.5.3 // indirect
6161
github.com/google/go-containerregistry v0.12.1 // indirect
6262
github.com/google/go-intervals v0.0.2 // indirect
6363
github.com/google/trillian v1.5.0 // indirect
@@ -119,18 +119,18 @@ require (
119119
go.mongodb.org/mongo-driver v1.11.1 // indirect
120120
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
121121
go.opencensus.io v0.24.0 // indirect
122-
golang.org/x/crypto v0.5.0 // indirect
123-
golang.org/x/mod v0.7.0 // indirect
124-
golang.org/x/net v0.7.0 // indirect
125-
golang.org/x/oauth2 v0.4.0 // indirect
122+
golang.org/x/crypto v0.19.0 // indirect
123+
golang.org/x/mod v0.8.0 // indirect
124+
golang.org/x/net v0.17.0 // indirect
125+
golang.org/x/oauth2 v0.7.0 // indirect
126126
golang.org/x/sync v0.1.0 // indirect
127-
golang.org/x/sys v0.5.0 // indirect
128-
golang.org/x/text v0.7.0 // indirect
129-
golang.org/x/tools v0.4.0 // indirect
127+
golang.org/x/sys v0.17.0 // indirect
128+
golang.org/x/text v0.14.0 // indirect
129+
golang.org/x/tools v0.6.0 // indirect
130130
google.golang.org/appengine v1.6.7 // indirect
131-
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
132-
google.golang.org/grpc v1.51.0 // indirect
133-
google.golang.org/protobuf v1.28.1 // indirect
131+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
132+
google.golang.org/grpc v1.56.3 // indirect
133+
google.golang.org/protobuf v1.30.0 // indirect
134134
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
135135
gopkg.in/yaml.v3 v3.0.1 // indirect
136136
)

go.sum

Lines changed: 35 additions & 2321 deletions
Large diffs are not rendered by default.

vendor/github.com/containers/ocicrypt/.golangci.yml

Lines changed: 10 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/CODE-OF-CONDUCT.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/Makefile

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/SECURITY.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/crypto/pkcs11/common.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/crypto/pkcs11/utils.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/keywrap/jwe/keywrapper_jwe.go

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/keywrap/pkcs11/keywrapper_pkcs11.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/spec/spec.go

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/utils/testing.go

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containers/ocicrypt/utils/utils.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-jose/go-jose/v3/BUG-BOUNTY.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

vendor/github.com/go-jose/go-jose/v3/CHANGELOG.md

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)