Skip to content

Commit a5d1368

Browse files
austinvazquezaustinvazquez
committed
vendor: github.com/containerd/[email protected]
This change vendors containerd/[email protected] which updates its dependency on square/go-jose/v2 (deprecated) to go-jose/go-jose/v3 (recommended) to resolve warnings for https://pkg.go.dev/vuln/GO-2024-2631. With 638b474, containerd/imgcrypt was temporarily removed in main, so there would not be a commit to cherry-pick for this change. full diff: containerd/imgcrypt@v1.1.7...v1.1.8 Signed-off-by: Austin Vazquez <[email protected]>
1 parent 6f0f4df commit a5d1368

72 files changed

Lines changed: 1141 additions & 1139 deletions

Some content is hidden

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

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/containerd/fifo v1.1.0
1717
github.com/containerd/go-cni v1.1.9
1818
github.com/containerd/go-runc v1.0.0
19-
github.com/containerd/imgcrypt v1.1.7
19+
github.com/containerd/imgcrypt v1.1.8
2020
github.com/containerd/log v0.1.0
2121
github.com/containerd/nri v0.6.1
2222
github.com/containerd/ttrpc v1.2.3
@@ -91,9 +91,10 @@ require (
9191
github.com/cilium/ebpf v0.9.1 // indirect
9292
github.com/containerd/cgroups v1.1.0 // indirect
9393
github.com/containerd/typeurl v1.0.2 // indirect
94-
github.com/containers/ocicrypt v1.1.6 // indirect
94+
github.com/containers/ocicrypt v1.1.10 // indirect
9595
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
9696
github.com/felixge/httpsnoop v1.0.3 // indirect
97+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9798
github.com/go-logr/logr v1.2.4 // indirect
9899
github.com/go-logr/stdr v1.2.2 // indirect
99100
github.com/godbus/dbus/v5 v5.1.0 // indirect
@@ -118,7 +119,7 @@ require (
118119
github.com/prometheus/procfs v0.8.0 // indirect
119120
github.com/russross/blackfriday/v2 v2.1.0 // indirect
120121
github.com/spf13/pflag v1.0.5 // indirect
121-
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
122+
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
122123
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
123124
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
124125
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
@@ -136,7 +137,6 @@ require (
136137
google.golang.org/appengine v1.6.7 // indirect
137138
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
138139
gopkg.in/inf.v0 v0.9.1 // indirect
139-
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
140140
gopkg.in/yaml.v2 v2.4.0 // indirect
141141
gopkg.in/yaml.v3 v3.0.1 // indirect
142142
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

‎go.sum‎

Lines changed: 29 additions & 451 deletions
Large diffs are not rendered by default.

‎integration/client/go.sum‎

Lines changed: 25 additions & 6 deletions
Large diffs are not rendered by default.

‎vendor/github.com/containerd/imgcrypt/.golangci.yml‎

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

‎vendor/github.com/containerd/imgcrypt/CHANGES‎

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

‎vendor/github.com/containerd/imgcrypt/README.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/containerd/imgcrypt/images/encryption/client.go‎

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

‎vendor/github.com/containerd/imgcrypt/images/encryption/encryption.go‎

Lines changed: 2 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/.gitignore‎

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/.golangci.yml‎

Lines changed: 35 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)