Skip to content

Commit ad79483

Browse files
committed
Merge branch main into fix-issue-8540
2 parents 5305bc5 + 281a820 commit ad79483

137 files changed

Lines changed: 6440 additions & 416 deletions

File tree

Some content is hidden

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

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ updates:
3131
open-pull-requests-limit: 1
3232
cooldown:
3333
default-days: 7
34+
groups:
35+
docker-compose:
36+
patterns:
37+
- "*"
3438
allow:
3539
- dependency-name: "ghcr.io/pkimetal/pkimetal"
3640
- dependency-name: "jaegertracing/all-in-one"

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
with:
2323
persist-credentials: false
2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
25+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
2626
- name: Autobuild
27-
uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
27+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
2828
- name: Perform CodeQL Analysis
29-
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
29+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

ca/ca_test.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func newCAArgs(t *testing.T) *caArgs {
124124
features.Reset()
125125

126126
fc := clock.NewFake()
127-
fc.Add(1 * time.Hour)
127+
fc.Set(time.Date(2020, 01, 01, 12, 00, 00, 0, time.UTC))
128128

129129
pa, err := policy.New(map[identifier.IdentifierType]bool{"dns": true}, nil, blog.NewMock())
130130
test.AssertNotError(t, err, "Couldn't create PA")
@@ -134,7 +134,11 @@ func newCAArgs(t *testing.T) *caArgs {
134134
legacy, err := issuance.NewProfile(issuance.ProfileConfig{
135135
MaxValidityPeriod: config.Duration{Duration: time.Hour * 24 * 90},
136136
MaxValidityBackdate: config.Duration{Duration: time.Hour},
137-
IgnoredLints: []string{"w_subject_common_name_included"},
137+
IgnoredLints: []string{
138+
"e_sub_cert_aia_does_not_contain_ocsp_url",
139+
"w_ct_sct_policy_count_unsatisfied",
140+
"n_subject_common_name_included",
141+
},
138142
})
139143
test.AssertNotError(t, err, "Loading test profile")
140144
modern, err := issuance.NewProfile(issuance.ProfileConfig{
@@ -144,7 +148,11 @@ func newCAArgs(t *testing.T) *caArgs {
144148
OmitSKID: true,
145149
MaxValidityPeriod: config.Duration{Duration: time.Hour * 24 * 6},
146150
MaxValidityBackdate: config.Duration{Duration: time.Hour},
147-
IgnoredLints: []string{"w_ext_subject_key_identifier_missing_sub_cert"},
151+
IgnoredLints: []string{
152+
"e_sub_cert_aia_does_not_contain_ocsp_url",
153+
"w_ct_sct_policy_count_unsatisfied",
154+
"w_ext_subject_key_identifier_missing_sub_cert",
155+
},
148156
})
149157
test.AssertNotError(t, err, "Loading test profile")
150158
profiles := map[string]*issuance.Profile{

cmd/cert-checker/main_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ func TestIgnoredLint(t *testing.T) {
594594
template.DNSNames = []string{"zombo.com"}
595595
template.KeyUsage = x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment
596596
template.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth}
597+
template.CRLDistributionPoints = []string{"http://crl.example.org"}
597598
template.IsCA = false
598599

599600
subjectCertDer, err := x509.CreateCertificate(nil, template, issuerCert, testKey.Public(), testKey)

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ require (
2727
github.com/redis/go-redis/extra/redisotel/v9 v9.5.3
2828
github.com/redis/go-redis/v9 v9.10.0
2929
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399
30-
github.com/weppos/publicsuffix-go v0.50.3
31-
github.com/zmap/zcrypto v0.0.0-20250129210703-03c45d0bae98
32-
github.com/zmap/zlint/v3 v3.6.6
30+
github.com/weppos/publicsuffix-go v0.50.4-0.20260507075217-1bd47f85b3da
31+
github.com/zmap/zcrypto v0.0.0-20260514033604-a1159eb3cad9
32+
github.com/zmap/zlint/v3 v3.7.2-0.20260531191521-b88ecfaefc52
3333
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
3434
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
3535
go.opentelemetry.io/otel v1.43.0

go.sum

Lines changed: 6 additions & 105 deletions
Large diffs are not rendered by default.

vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go

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

vendor/github.com/zmap/zcrypto/json/ecdhe.go

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

vendor/github.com/zmap/zcrypto/json/names.go

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

vendor/github.com/zmap/zcrypto/json/rsa.go

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

0 commit comments

Comments
 (0)