@@ -32,7 +32,7 @@ import (
3232 "golang.org/x/crypto/ocsp"
3333
3434 ca_config "github.com/letsencrypt/boulder/ca/config"
35- caPB "github.com/letsencrypt/boulder/ca/proto"
35+ capb "github.com/letsencrypt/boulder/ca/proto"
3636 "github.com/letsencrypt/boulder/cmd"
3737 "github.com/letsencrypt/boulder/core"
3838 corepb "github.com/letsencrypt/boulder/core/proto"
@@ -348,7 +348,7 @@ func TestIssuePrecertificate(t *testing.T) {
348348 req , err := x509 .ParseCertificateRequest (testCase .csr )
349349 test .AssertNotError (t , err , "Certificate request failed to parse" )
350350
351- issueReq := & caPB .IssueCertificateRequest {Csr : testCase .csr , RegistrationID : & arbitraryRegID }
351+ issueReq := & capb .IssueCertificateRequest {Csr : testCase .csr , RegistrationID : & arbitraryRegID }
352352
353353 var certDER []byte
354354 response , err := ca .IssuePrecertificate (ctx , issueReq )
@@ -456,7 +456,7 @@ func TestMultipleIssuers(t *testing.T) {
456456 nil )
457457 test .AssertNotError (t , err , "Failed to remake CA" )
458458
459- issuedCert , err := ca .IssuePrecertificate (ctx , & caPB .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID })
459+ issuedCert , err := ca .IssuePrecertificate (ctx , & capb .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID })
460460 test .AssertNotError (t , err , "Failed to issue certificate" )
461461
462462 cert , err := x509 .ParseCertificate (issuedCert .DER )
@@ -481,14 +481,14 @@ func TestOCSP(t *testing.T) {
481481 nil )
482482 test .AssertNotError (t , err , "Failed to create CA" )
483483
484- issueReq := caPB .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID }
484+ issueReq := capb .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID }
485485
486486 cert , err := ca .IssuePrecertificate (ctx , & issueReq )
487487 test .AssertNotError (t , err , "Failed to issue" )
488488 parsedCert , err := x509 .ParseCertificate (cert .DER )
489489 test .AssertNotError (t , err , "Failed to parse cert" )
490490 status := string (core .OCSPStatusGood )
491- ocspResp , err := ca .GenerateOCSP (ctx , & caPB .GenerateOCSPRequest {
491+ ocspResp , err := ca .GenerateOCSP (ctx , & capb .GenerateOCSPRequest {
492492 CertDER : cert .DER ,
493493 Status : & status ,
494494 })
@@ -500,7 +500,7 @@ func TestOCSP(t *testing.T) {
500500 test .AssertEquals (t , parsed .SerialNumber .Cmp (parsedCert .SerialNumber ), 0 )
501501
502502 // Test that signatures are checked.
503- _ , err = ca .GenerateOCSP (ctx , & caPB .GenerateOCSPRequest {
503+ _ , err = ca .GenerateOCSP (ctx , & capb .GenerateOCSPRequest {
504504 CertDER : append (cert .DER , byte (0 )),
505505 Status : & status ,
506506 })
@@ -543,7 +543,7 @@ func TestOCSP(t *testing.T) {
543543
544544 // ocspResp2 is a second OCSP response for `cert` (issued by caCert), and
545545 // should be signed by caCert.
546- ocspResp2 , err := ca .GenerateOCSP (ctx , & caPB .GenerateOCSPRequest {
546+ ocspResp2 , err := ca .GenerateOCSP (ctx , & capb .GenerateOCSPRequest {
547547 CertDER : append ([]byte (nil ), cert .DER ... ),
548548 Status : & status ,
549549 })
@@ -553,7 +553,7 @@ func TestOCSP(t *testing.T) {
553553
554554 // newCertOcspResp is an OCSP response for `newCert` (issued by newIssuer),
555555 // and should be signed by newIssuer.
556- newCertOcspResp , err := ca .GenerateOCSP (ctx , & caPB .GenerateOCSPRequest {
556+ newCertOcspResp , err := ca .GenerateOCSP (ctx , & capb .GenerateOCSPRequest {
557557 CertDER : newCert .DER ,
558558 Status : & status ,
559559 })
@@ -631,7 +631,7 @@ func TestInvalidCSRs(t *testing.T) {
631631
632632 t .Run (testCase .name , func (t * testing.T ) {
633633 serializedCSR := mustRead (testCase .csrPath )
634- issueReq := & caPB .IssueCertificateRequest {Csr : serializedCSR , RegistrationID : & arbitraryRegID }
634+ issueReq := & capb .IssueCertificateRequest {Csr : serializedCSR , RegistrationID : & arbitraryRegID }
635635 _ , err = ca .IssuePrecertificate (ctx , issueReq )
636636
637637 test .Assert (t , berrors .Is (err , testCase .errorType ), "Incorrect error type returned" )
@@ -666,7 +666,7 @@ func TestRejectValidityTooLong(t *testing.T) {
666666 test .AssertNotError (t , err , "Failed to parse time" )
667667 testCtx .fc .Set (future )
668668 // Test that the CA rejects CSRs that would expire after the intermediate cert
669- _ , err = ca .IssuePrecertificate (ctx , & caPB .IssueCertificateRequest {Csr : NoCNCSR , RegistrationID : & arbitraryRegID })
669+ _ , err = ca .IssuePrecertificate (ctx , & capb .IssueCertificateRequest {Csr : NoCNCSR , RegistrationID : & arbitraryRegID })
670670 test .AssertError (t , err , "Cannot issue a certificate that expires after the intermediate certificate" )
671671 test .Assert (t , berrors .Is (err , berrors .InternalServer ), "Incorrect error type returned" )
672672}
@@ -842,7 +842,7 @@ func TestIssueCertificateForPrecertificate(t *testing.T) {
842842 test .AssertNotError (t , err , "Failed to create CA" )
843843
844844 orderID := int64 (0 )
845- issueReq := caPB .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID , OrderID : & orderID }
845+ issueReq := capb .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID , OrderID : & orderID }
846846 precert , err := ca .IssuePrecertificate (ctx , & issueReq )
847847 test .AssertNotError (t , err , "Failed to issue precert" )
848848 parsedPrecert , err := x509 .ParseCertificate (precert .DER )
@@ -863,7 +863,7 @@ func TestIssueCertificateForPrecertificate(t *testing.T) {
863863 }
864864
865865 test .AssertNotError (t , err , "Failed to marshal SCT" )
866- cert , err := ca .IssueCertificateForPrecertificate (ctx , & caPB .IssueCertificateForPrecertificateRequest {
866+ cert , err := ca .IssueCertificateForPrecertificate (ctx , & capb .IssueCertificateForPrecertificateRequest {
867867 DER : precert .DER ,
868868 SCTs : sctBytes ,
869869 RegistrationID : & arbitraryRegID ,
@@ -929,10 +929,10 @@ func TestIssueCertificateForPrecertificateDuplicateSerial(t *testing.T) {
929929 }
930930
931931 orderID := int64 (0 )
932- issueReq := caPB .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID , OrderID : & orderID }
932+ issueReq := capb .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID , OrderID : & orderID }
933933 precert , err := ca .IssuePrecertificate (ctx , & issueReq )
934934 test .AssertNotError (t , err , "Failed to issue precert" )
935- _ , err = ca .IssueCertificateForPrecertificate (ctx , & caPB .IssueCertificateForPrecertificateRequest {
935+ _ , err = ca .IssueCertificateForPrecertificate (ctx , & capb .IssueCertificateForPrecertificateRequest {
936936 DER : precert .DER ,
937937 SCTs : sctBytes ,
938938 RegistrationID : & arbitraryRegID ,
@@ -960,7 +960,7 @@ func TestIssueCertificateForPrecertificateDuplicateSerial(t *testing.T) {
960960 nil )
961961 test .AssertNotError (t , err , "Failed to create CA" )
962962
963- _ , err = errorca .IssueCertificateForPrecertificate (ctx , & caPB .IssueCertificateForPrecertificateRequest {
963+ _ , err = errorca .IssueCertificateForPrecertificate (ctx , & capb .IssueCertificateForPrecertificateRequest {
964964 DER : precert .DER ,
965965 SCTs : sctBytes ,
966966 RegistrationID : & arbitraryRegID ,
@@ -1039,7 +1039,7 @@ func TestPrecertOrphanQueue(t *testing.T) {
10391039 }
10401040
10411041 var one int64 = 1
1042- _ , err = ca .IssuePrecertificate (context .Background (), & caPB .IssueCertificateRequest {
1042+ _ , err = ca .IssuePrecertificate (context .Background (), & capb .IssueCertificateRequest {
10431043 RegistrationID : & one ,
10441044 OrderID : & one ,
10451045 Csr : CNandSANCSR ,
@@ -1227,7 +1227,7 @@ func TestIssuePrecertificateLinting(t *testing.T) {
12271227 testCtx .logger .Clear ()
12281228
12291229 // Attempt to issue a pre-certificate
1230- _ , err = ca .IssuePrecertificate (ctx , & caPB .IssueCertificateRequest {
1230+ _ , err = ca .IssuePrecertificate (ctx , & capb .IssueCertificateRequest {
12311231 Csr : CNandSANCSR ,
12321232 RegistrationID : & arbitraryRegID ,
12331233 })
@@ -1265,7 +1265,7 @@ func TestGenerateOCSPWithIssuerID(t *testing.T) {
12651265 issuerID := int64 (666 )
12661266 serial := "DEADDEADDEADDEADDEADDEADDEADDEADDEAD"
12671267 status := string (core .OCSPStatusGood )
1268- _ , err = ca .GenerateOCSP (context .Background (), & caPB .GenerateOCSPRequest {
1268+ _ , err = ca .GenerateOCSP (context .Background (), & capb .GenerateOCSPRequest {
12691269 IssuerID : & issuerID ,
12701270 Serial : & serial ,
12711271 Status : & status ,
@@ -1274,18 +1274,18 @@ func TestGenerateOCSPWithIssuerID(t *testing.T) {
12741274
12751275 // GenerateOCSP with feature enabled + req contains good IssuerID
12761276 issuerID = idForIssuer (ca .defaultIssuer .cert )
1277- _ , err = ca .GenerateOCSP (context .Background (), & caPB .GenerateOCSPRequest {
1277+ _ , err = ca .GenerateOCSP (context .Background (), & capb .GenerateOCSPRequest {
12781278 IssuerID : & issuerID ,
12791279 Serial : & serial ,
12801280 Status : & status ,
12811281 })
12821282 test .AssertNotError (t , err , "GenerateOCSP failed" )
12831283
12841284 // GenerateOCSP with feature enabled + req doesn't contain IssuerID
1285- issueReq := caPB .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID }
1285+ issueReq := capb .IssueCertificateRequest {Csr : CNandSANCSR , RegistrationID : & arbitraryRegID }
12861286 cert , err := ca .IssuePrecertificate (ctx , & issueReq )
12871287 test .AssertNotError (t , err , "Failed to issue" )
1288- _ , err = ca .GenerateOCSP (context .Background (), & caPB .GenerateOCSPRequest {
1288+ _ , err = ca .GenerateOCSP (context .Background (), & capb .GenerateOCSPRequest {
12891289 CertDER : cert .DER ,
12901290 Status : & status ,
12911291 })
0 commit comments