Skip to content

Commit 453d6a0

Browse files
Replace deprecated golang/x/crypto/openpgp (#56)
* Replace golang/x/crypto with github.com/ProtonMail/go-crypto * Use github.com/pgpkeys-eu/go-crypto for V3 signatures compatibility
1 parent 38447aa commit 453d6a0

File tree

253 files changed

+31944
-5078
lines changed

Some content is hidden

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

253 files changed

+31944
-5078
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ export GO_EXECUTABLE_PATH := $(shell which go)
33
build:
44
@mkdir -p ./bin && go build -o ./bin/ -v ./...
55

6+
run-sync: build
7+
@cd ./bin && ./minima sync -c minima.yaml
8+
69
test:
710
@$$GO_EXECUTABLE_PATH test -v -race ./...
811

get/syncer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"path/filepath"
1515
"strings"
1616

17+
"github.com/ProtonMail/go-crypto/openpgp"
1718
"github.com/klauspost/compress/zstd"
1819
"github.com/uyuni-project/minima/util"
19-
"golang.org/x/crypto/openpgp"
2020
)
2121

2222
// common
@@ -289,7 +289,7 @@ func (r *Syncer) checkRepomdSignature(repomdReader io.Reader, repoType RepoType)
289289
if err != nil {
290290
return &SignatureError{keyPath + " file does not contain a valid signature"}
291291
}
292-
_, err = openpgp.CheckArmoredDetachedSignature(keyring, repomdReader, signatureReader)
292+
_, err = openpgp.CheckArmoredDetachedSignature(keyring, repomdReader, signatureReader, nil)
293293
if err != nil {
294294
return &SignatureError{ascPath + " signature check failed, signature is not valid"}
295295
}

go.mod

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,24 @@ module github.com/uyuni-project/minima
33
go 1.24.1
44

55
require (
6+
github.com/ProtonMail/go-crypto v1.1.6
67
github.com/aws/aws-sdk-go v1.55.6
78
github.com/klauspost/compress v1.18.0
89
github.com/spf13/cobra v1.9.1
910
github.com/stretchr/testify v1.10.0
10-
golang.org/x/crypto v0.36.0
1111
gopkg.in/yaml.v2 v2.4.0
1212
)
1313

1414
require (
15+
github.com/cloudflare/circl v1.3.7 // indirect
1516
github.com/davecgh/go-spew v1.1.1 // indirect
1617
github.com/inconshreveable/mousetrap v1.1.0 // indirect
1718
github.com/jmespath/go-jmespath v0.4.0 // indirect
1819
github.com/pmezard/go-difflib v1.0.0 // indirect
1920
github.com/spf13/pflag v1.0.6 // indirect
21+
golang.org/x/crypto v0.17.0 // indirect
22+
golang.org/x/sys v0.16.0 // indirect
2023
gopkg.in/yaml.v3 v3.0.1 // indirect
2124
)
25+
26+
replace github.com/ProtonMail/go-crypto => github.com/pgpkeys-eu/go-crypto v1.1.4-pgpkeys

go.sum

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk=
22
github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
3+
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
4+
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
35
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
46
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
57
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -12,6 +14,8 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
1214
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
1315
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
1416
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
17+
github.com/pgpkeys-eu/go-crypto v1.1.4-pgpkeys h1:WOoj/kf46fzo/QBU7TEXOKex+Vr0F0qTkxi9hxX+aGc=
18+
github.com/pgpkeys-eu/go-crypto v1.1.4-pgpkeys/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
1519
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1620
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1721
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -22,8 +26,10 @@ github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
2226
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2327
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
2428
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
25-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
26-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
29+
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
30+
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
31+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
32+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2733
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2834
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2935
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

vendor/github.com/ProtonMail/go-crypto/AUTHORS

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

vendor/github.com/ProtonMail/go-crypto/CONTRIBUTORS

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

vendor/github.com/ProtonMail/go-crypto/LICENSE

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

vendor/github.com/ProtonMail/go-crypto/PATENTS

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