Skip to content

Commit

Permalink
vendor: github.com/containerd/imgcrypt@v1.1.8
Browse files Browse the repository at this point in the history
This change vendors github.com/containerd/imgcrypt@v1.1.8 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.4...v1.1.8

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
  • Loading branch information
austinvazquez committed May 13, 2024
1 parent 48efdf7 commit 6951203
Show file tree
Hide file tree
Showing 76 changed files with 1,251 additions and 820 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/containerd/fifo v1.0.0
github.com/containerd/go-cni v1.1.6
github.com/containerd/go-runc v1.0.0
github.com/containerd/imgcrypt v1.1.4
github.com/containerd/imgcrypt v1.1.8
github.com/containerd/log v0.1.0
github.com/containerd/nri v0.1.1
github.com/containerd/ttrpc v1.1.2
Expand Down Expand Up @@ -85,9 +85,10 @@ require (
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cilium/ebpf v0.7.0 // indirect
github.com/containers/ocicrypt v1.1.3 // indirect
github.com/containers/ocicrypt v1.1.10 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
Expand All @@ -111,7 +112,7 @@ require (
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
go.opencensus.io v0.24.0 // indirect
Expand All @@ -126,7 +127,6 @@ require (
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
Expand Down
135 changes: 32 additions & 103 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration/client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1
github.com/containerd/cgroups v1.0.4
// the actual version of containerd is replaced with the code at the root of this repository
github.com/containerd/containerd v1.6.18
github.com/containerd/containerd v1.6.23
github.com/containerd/continuity v0.3.0
github.com/containerd/go-runc v1.0.0
github.com/containerd/ttrpc v1.1.2
Expand Down
27 changes: 19 additions & 8 deletions integration/client/go.sum

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions vendor/github.com/containerd/imgcrypt/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/github.com/containerd/imgcrypt/CHANGES

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions vendor/github.com/containerd/imgcrypt/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions vendor/github.com/containerd/imgcrypt/images/encryption/payload.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/containers/ocicrypt/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions vendor/github.com/containers/ocicrypt/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions vendor/github.com/containers/ocicrypt/.travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/ocicrypt/CODE-OF-CONDUCT.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/containers/ocicrypt/MAINTAINERS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/containers/ocicrypt/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/containers/ocicrypt/SECURITY.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6951203

Please sign in to comment.