Skip to content

Commit d969603

Browse files
authored
Merge pull request #771 from containers/renovate/github.com-containers-ocicrypt-1.x
Update module github.com/containers/ocicrypt to v1.3.0
2 parents 7d53666 + f8b23b1 commit d969603

9 files changed

Lines changed: 271 additions & 54 deletions

File tree

common/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/checkpoint-restore/checkpointctl v1.5.0
99
github.com/checkpoint-restore/go-criu/v8 v8.2.0
1010
github.com/containerd/platforms v1.0.0-rc.4
11-
github.com/containers/ocicrypt v1.2.1
11+
github.com/containers/ocicrypt v1.3.0
1212
github.com/coreos/go-systemd/v22 v22.7.0
1313
github.com/cyphar/filepath-securejoin v0.6.1
1414
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc

common/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ github.com/containerd/stargz-snapshotter/estargz v0.18.2 h1:yXkZFYIzz3eoLwlTUZKz
4949
github.com/containerd/stargz-snapshotter/estargz v0.18.2/go.mod h1:XyVU5tcJ3PRpkA9XS2T5us6Eg35yM0214Y+wvrZTBrY=
5050
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
5151
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
52-
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
53-
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
52+
github.com/containers/ocicrypt v1.3.0 h1:ps3St6ZWNWhOQ/Kqld6K2wPHt01Mj3AqRTNCZLIWOfo=
53+
github.com/containers/ocicrypt v1.3.0/go.mod h1:PmfuGFpBwnGLnbqBm+QIy2nc8noDJ1Wt6B19la7VBFo=
5454
github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA=
5555
github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
5656
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

go.work.sum

Lines changed: 139 additions & 11 deletions
Large diffs are not rendered by default.

image/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
dario.cat/mergo v1.0.2
1010
github.com/BurntSushi/toml v1.6.0
1111
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01
12-
github.com/containers/ocicrypt v1.2.1
12+
github.com/containers/ocicrypt v1.3.0
1313
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467
1414
github.com/distribution/reference v0.6.0
1515
github.com/docker/cli v29.4.0+incompatible

image/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ github.com/containerd/stargz-snapshotter/estargz v0.18.2 h1:yXkZFYIzz3eoLwlTUZKz
3131
github.com/containerd/stargz-snapshotter/estargz v0.18.2/go.mod h1:XyVU5tcJ3PRpkA9XS2T5us6Eg35yM0214Y+wvrZTBrY=
3232
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
3333
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
34-
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
35-
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
34+
github.com/containers/ocicrypt v1.3.0 h1:ps3St6ZWNWhOQ/Kqld6K2wPHt01Mj3AqRTNCZLIWOfo=
35+
github.com/containers/ocicrypt v1.3.0/go.mod h1:PmfuGFpBwnGLnbqBm+QIy2nc8noDJ1Wt6B19la7VBFo=
3636
github.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc=
3737
github.com/coreos/go-oidc/v3 v3.17.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=
3838
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=

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

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

vendor/github.com/containers/ocicrypt/config/keyprovider-config/config.go

Lines changed: 29 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/keyprovider/keyprovider.go

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

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ github.com/containerd/stargz-snapshotter/estargz/errorutil
6565
# github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01
6666
## explicit
6767
github.com/containers/libtrust
68-
# github.com/containers/ocicrypt v1.2.1
69-
## explicit; go 1.22
68+
# github.com/containers/ocicrypt v1.3.0
69+
## explicit; go 1.24.0
7070
github.com/containers/ocicrypt
7171
github.com/containers/ocicrypt/blockcipher
7272
github.com/containers/ocicrypt/config

0 commit comments

Comments
 (0)