From b50b22db1207c6722639c507e8bebf59f6805d3b Mon Sep 17 00:00:00 2001 From: Phil Porada Date: Thu, 27 Jul 2023 10:15:36 -0400 Subject: [PATCH] Use correct InputCertPath for cross sign ceremonies and output more informative failure message --- test/cert-ceremonies/generate.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cert-ceremonies/generate.go b/test/cert-ceremonies/generate.go index 5da6e773b1c..233e8c1d55b 100644 --- a/test/cert-ceremonies/generate.go +++ b/test/cert-ceremonies/generate.go @@ -173,15 +173,15 @@ func main() { // Create the A cross-signed intermediate certificates err = genCert(rsaTmpCrossIntermediateA) - cmd.FailOnError(err, "failed to generate RSA cross-signed intermediate cert") + cmd.FailOnError(err, "failed to generate RSA cross-signed intermediate cert A") err = genCert(ecdsaTmpCrossIntermediateA) - cmd.FailOnError(err, "failed to generate ECDSA cross-signed intermediate cert") + cmd.FailOnError(err, "failed to generate ECDSA cross-signed intermediate cert A") // Create the B cross-signed intermediate ceremony config files with the // root signing key slots and IDs rsaTmpCrossIntermediateB, err := rewriteConfig("test/cert-ceremonies/intermediate-cross-cert-ceremony-rsa.yaml", map[string]string{ "SlotID": rsaRootKeySlot, - "InputCertPath": "/hierarchy/intermediate-cert-rsa-a.pem", + "InputCertPath": "/hierarchy/intermediate-cert-rsa-b.pem", "OutputCertPath": "/hierarchy/intermediate-cross-cert-rsa-b.pem", "CommonName": "CA intermediate (RSA) B", }) @@ -196,9 +196,9 @@ func main() { // Create the B cross-signed intermediate certificates err = genCert(rsaTmpCrossIntermediateB) - cmd.FailOnError(err, "failed to generate RSA cross-signed intermediate cert") + cmd.FailOnError(err, "failed to generate RSA cross-signed intermediate cert B") err = genCert(ecdsaTmpCrossIntermediateB) - cmd.FailOnError(err, "failed to generate ECDSA cross-signed intermediate cert") + cmd.FailOnError(err, "failed to generate ECDSA cross-signed intermediate cert B") // Create CRLs stating that the intermediates are not revoked. rsaTmpCRLConfig, err := rewriteConfig("test/cert-ceremonies/root-crl-rsa.yaml", map[string]string{