letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated UseFor[RSA|ECDSA]Leaves configs (#7523) 

These were removed from production configs in IN-10212.
This commit is contained in:
Aaron Gable 2024-06-04 22:30:04 -07:00 committed by GitHub
parent 09693f03dc
commit 13d2544bc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
issuance/issuer.go
View File

@ -161,21 +161,6 @@ type IssuerConfig struct {
// the ECDSAForAll feature flag, and the ECDSAAllowListFilename config field.
Active bool
// UseForRSALeaves is a synonym for Active. Note that, despite the name,
// setting this field to true cannot add an issuer to a pool different than
// its key type. An active issuer will always be part of a pool based on its
// key type.
//
// Deprecated: use Active instead.
UseForRSALeaves bool
// UseForECDSALeaves is a synonym for Active. Note that, despite the name,
// setting this field to true cannot add an issuer to a pool different than
// its key type. An active issuer will always be part of a pool based on its
// key type.
//
// Deprecated: use Active instead.
UseForECDSALeaves bool
IssuerURL string `validate:"required,url"`
OCSPURL string `validate:"required,url"`
CRLURLBase string `validate:"omitempty,url,startswith=http://,endswith=/"`
@ -288,7 +273,7 @@ func newIssuer(config IssuerConfig, cert *Certificate, signer crypto.Signer, clk
Linter: lintSigner,
keyAlg: keyAlg,
sigAlg: sigAlg,
active: config.Active || config.UseForRSALeaves || config.UseForECDSALeaves,
active: config.Active,
issuerURL: config.IssuerURL,
ocspURL: config.OCSPURL,
crlURLBase: config.CRLURLBase,

44
test/config/ca.json
View File

@ -59,8 +59,7 @@
},
"issuers": [
{
"useForRSALeaves": false,
"useForECDSALeaves": true,
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-a/",
@ -71,8 +70,29 @@
}
},
{
"useForRSALeaves": true,
"useForECDSALeaves": true,
"active": true,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-b",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-b/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-b.cert.pem",
"numSessions": 2
}
},
{
"active": false,
"issuerURL": "http://ca.example.org:4502/int-ecdsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/ecdsa-c/",
"location": {
"configFile": "test/certs/webpki/int-ecdsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-ecdsa-c.cert.pem",
"numSessions": 2
}
},
{
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-a",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-a/",
@ -83,16 +103,26 @@
}
},
{
"useForRSALeaves": false,
"useForECDSALeaves": false,
"active": true,
"issuerURL": "http://ca.example.org:4502/int-rsa-b",
"ocspURL": "http://ca.example.org:4003/",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-b/",
"location": {
"configFile": "test/certs/webpki/int-rsa-b.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-b.cert.pem",
"numSessions": 2
}
},
{
"active": false,
"issuerURL": "http://ca.example.org:4502/int-rsa-c",
"ocspURL": "http://ca.example.org:4002/",
"crlURLBase": "http://ca.example.org:4501/rsa-c/",
"location": {
"configFile": "test/certs/webpki/int-rsa-c.pkcs11.json",
"certFile": "test/certs/webpki/int-rsa-c.cert.pem",
"numSessions": 2
}
}
],
"ignoredLints": [