Skip to content

Commit f9a5cf8

Browse files
committed
chore(deps): move vendored go-pkcs12 from third_party to pkg
third_party only ever held the patched go-pkcs12 module, while pkg already hosts the vendored bom module. Keep nested modules in one place and update the replace directive and comments accordingly.
1 parent f6c53de commit f9a5cf8

13 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ require (
101101
replace github.com/bitxeno/atvloadly/pkg/bom => ./pkg/bom
102102

103103
// go-pkcs12 v0.7.3 derives keys with whatever iteration count the file asks
104-
// for, so a tiny P12 can pin a CPU indefinitely. third_party/go-pkcs12 is
104+
// for, so a tiny P12 can pin a CPU indefinitely. pkg/go-pkcs12 is
105105
// v0.7.3 plus the patch of SSLMate/go-pkcs12#81, which refuses counts above
106106
// 5,000,000 in every KDF; drop this replace once a release bounds KDF
107107
// iterations.
108-
replace software.sslmate.com/src/go-pkcs12 => ./third_party/go-pkcs12
108+
replace software.sslmate.com/src/go-pkcs12 => ./pkg/go-pkcs12

‎internal/signing/p12.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type P12Identity struct {
2020
PrivateKey crypto.Signer
2121
}
2222

23-
// Error texts of go-pkcs12 v0.7.3 (with the KDF bound of third_party/go-pkcs12)
23+
// Error texts of go-pkcs12 v0.7.3 (with the KDF bound of pkg/go-pkcs12)
2424
// that have no exported sentinel.
2525
const (
2626
pkcs12ErrManyKeys = "pkcs12: expected exactly one key bag"

‎internal/signing/p12_iterations_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
// testMaxKDFIterations is the largest iteration count the patched go-pkcs12
19-
// of third_party/go-pkcs12 derives a key with.
19+
// of pkg/go-pkcs12 derives a key with.
2020
const testMaxKDFIterations = 5_000_000
2121

2222
// testKDFIterations is the iteration count of the key derivations the

0 commit comments

Comments
 (0)
⌂ 换网址