Skip to content

Commit 61983ac

Browse files
committed
fix: update frozen pkcs 12 package as proposed in golang.org/x/crypto/pkcs12
1 parent c730e44 commit 61983ac

File tree

21 files changed

+1686
-628
lines changed

21 files changed

+1686
-628
lines changed

cmd/signing-server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/spf13/pflag"
2222
"go.uber.org/zap"
2323
"go.uber.org/zap/zapcore"
24-
"golang.org/x/crypto/pkcs12"
24+
"software.sslmate.com/src/go-pkcs12"
2525

2626
"github.com/open-component-model/signing-server/pkg/encoding"
2727
"github.com/open-component-model/signing-server/pkg/handler/sign"

go.mod

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ require (
99
github.com/pkg/errors v0.9.1
1010
github.com/spf13/pflag v1.0.6
1111
go.uber.org/zap v1.27.0
12-
golang.org/x/crypto v0.39.0
12+
software.sslmate.com/src/go-pkcs12 v0.5.0
1313
)
1414

15-
require go.uber.org/multierr v1.10.0 // indirect
15+
require (
16+
go.uber.org/multierr v1.10.0 // indirect
17+
golang.org/x/crypto v0.39.0 // indirect
18+
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
2424
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
2525
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2626
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
27+
software.sslmate.com/src/go-pkcs12 v0.5.0 h1:EC6R394xgENTpZ4RltKydeDUjtlM5drOYIG9c6TVj2M=
28+
software.sslmate.com/src/go-pkcs12 v0.5.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=

vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go

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

vendor/golang.org/x/crypto/pkcs12/crypto.go

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

vendor/golang.org/x/crypto/pkcs12/mac.go

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

0 commit comments

Comments
 (0)