Skip to content

Commit 7e04a71

Browse files
authored
test: Update cert-checker & ca configs to match prod (#8303)
1 parent 9b3fc40 commit 7e04a71

File tree

4 files changed

+37
-19
lines changed

4 files changed

+37
-19
lines changed

test/config-next/ca.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,39 +54,46 @@
5454
"issuance": {
5555
"certProfiles": {
5656
"legacy": {
57+
"omitCommonName": false,
58+
"omitKeyEncipherment": false,
59+
"omitClientAuth": false,
60+
"omitSKID": false,
5761
"includeCRLDistributionPoints": true,
5862
"maxValidityPeriod": "7776000s",
5963
"maxValidityBackdate": "1h5m",
6064
"lintConfig": "test/config-next/zlint.toml",
6165
"ignoredLints": [
6266
"w_subject_common_name_included",
67+
"e_dnsname_not_valid_tld",
6368
"w_ext_subject_key_identifier_not_recommended_subscriber"
6469
]
6570
},
66-
"modern": {
71+
"shortlived": {
6772
"omitCommonName": true,
6873
"omitKeyEncipherment": true,
6974
"omitClientAuth": true,
7075
"omitSKID": true,
7176
"includeCRLDistributionPoints": true,
72-
"maxValidityPeriod": "583200s",
77+
"maxValidityPeriod": "160h",
7378
"maxValidityBackdate": "1h5m",
7479
"lintConfig": "test/config-next/zlint.toml",
7580
"ignoredLints": [
76-
"w_ext_subject_key_identifier_missing_sub_cert"
81+
"w_ext_subject_key_identifier_missing_sub_cert",
82+
"e_dnsname_not_valid_tld"
7783
]
7884
},
79-
"shortlived": {
85+
"modern": {
8086
"omitCommonName": true,
8187
"omitKeyEncipherment": true,
8288
"omitClientAuth": true,
8389
"omitSKID": true,
8490
"includeCRLDistributionPoints": true,
85-
"maxValidityPeriod": "160h",
91+
"maxValidityPeriod": "583200s",
8692
"maxValidityBackdate": "1h5m",
8793
"lintConfig": "test/config-next/zlint.toml",
8894
"ignoredLints": [
89-
"w_ext_subject_key_identifier_missing_sub_cert"
95+
"w_ext_subject_key_identifier_missing_sub_cert",
96+
"e_dnsname_not_valid_tld"
9097
]
9198
}
9299
},

test/config-next/cert-checker.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
"badResultsOnly": true,
1111
"checkPeriod": "72h",
1212
"acceptableValidityDurations": [
13-
"7776000s"
13+
"7776000s",
14+
"160h"
1415
],
1516
"lintConfig": "test/config-next/zlint.toml",
1617
"ignoredLints": [
17-
"w_subject_common_name_included",
1818
"w_ext_subject_key_identifier_missing_sub_cert",
19+
"w_subject_common_name_included",
20+
"e_dnsname_not_valid_tld",
1921
"w_ext_subject_key_identifier_not_recommended_subscriber"
2022
],
2123
"ctLogListFile": "test/ct-test-srv/log_list.json",

test/config/ca.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,45 +55,52 @@
5555
"issuance": {
5656
"certProfiles": {
5757
"legacy": {
58-
"allowMustStaple": true,
58+
"allowMustStaple": false,
59+
"omitCommonName": false,
60+
"omitKeyEncipherment": false,
61+
"omitClientAuth": false,
62+
"omitSKID": false,
5963
"omitOCSP": true,
6064
"includeCRLDistributionPoints": true,
6165
"maxValidityPeriod": "7776000s",
6266
"maxValidityBackdate": "1h5m",
6367
"lintConfig": "test/config-next/zlint.toml",
6468
"ignoredLints": [
6569
"w_subject_common_name_included",
70+
"e_dnsname_not_valid_tld",
6671
"w_ext_subject_key_identifier_not_recommended_subscriber"
6772
]
6873
},
69-
"modern": {
70-
"allowMustStaple": true,
74+
"shortlived": {
75+
"allowMustStaple": false,
7176
"omitCommonName": true,
7277
"omitKeyEncipherment": true,
7378
"omitClientAuth": true,
7479
"omitSKID": true,
7580
"omitOCSP": true,
7681
"includeCRLDistributionPoints": true,
77-
"maxValidityPeriod": "583200s",
82+
"maxValidityPeriod": "160h",
7883
"maxValidityBackdate": "1h5m",
7984
"lintConfig": "test/config-next/zlint.toml",
8085
"ignoredLints": [
81-
"w_ext_subject_key_identifier_missing_sub_cert"
86+
"w_ext_subject_key_identifier_missing_sub_cert",
87+
"e_dnsname_not_valid_tld"
8288
]
8389
},
84-
"shortlived": {
85-
"allowMustStaple": true,
90+
"modern": {
91+
"allowMustStaple": false,
8692
"omitCommonName": true,
8793
"omitKeyEncipherment": true,
8894
"omitClientAuth": true,
8995
"omitSKID": true,
9096
"omitOCSP": true,
9197
"includeCRLDistributionPoints": true,
92-
"maxValidityPeriod": "160h",
98+
"maxValidityPeriod": "583200s",
9399
"maxValidityBackdate": "1h5m",
94100
"lintConfig": "test/config-next/zlint.toml",
95101
"ignoredLints": [
96-
"w_ext_subject_key_identifier_missing_sub_cert"
102+
"w_ext_subject_key_identifier_missing_sub_cert",
103+
"e_dnsname_not_valid_tld"
97104
]
98105
}
99106
},

test/config/cert-checker.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
"badResultsOnly": true,
1111
"checkPeriod": "72h",
1212
"acceptableValidityDurations": [
13-
"7776000s"
13+
"7776000s",
14+
"160h"
1415
],
1516
"ignoredLints": [
16-
"w_subject_common_name_included",
1717
"w_ext_subject_key_identifier_missing_sub_cert",
18+
"w_subject_common_name_included",
19+
"e_dnsname_not_valid_tld",
1820
"w_ext_subject_key_identifier_not_recommended_subscriber"
1921
],
2022
"ctLogListFile": "test/ct-test-srv/log_list.json"

0 commit comments

Comments
 (0)