Skip to content

Switch to using new Go 1.19 CRL parser #12315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepthi merged 1 commit into from
Feb 15, 2023
Merged

Switch to using new Go 1.19 CRL parser #12315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions go/vt/tlstest/tlstest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,18 @@ func RevokeCertAndRegenerateCRL(root, parent, name string) {
if err != nil {
log.Fatal(err)
}
crlList, err := x509.ParseCRL(data)

block, _ := pem.Decode(data)
if block == nil || block.Type != "X509 CRL" {
log.Fatal("failed to parse CRL PEM")
}
Copy link
Copy Markdown
Member Author

@dbussink dbussink Feb 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PEM decoding is not done implicitly with x509.ParseRevocationList so this needs to be done here explicitly in the tests.


crlList, err := x509.ParseRevocationList(block.Bytes)
if err != nil {
log.Fatal(err)
}

revoked := crlList.TBSCertList.RevokedCertificates
revoked := crlList.RevokedCertificates
revoked = append(revoked, pkix.RevokedCertificate{
SerialNumber: certificate.SerialNumber,
RevocationTime: time.Now(),
Expand All @@ -357,9 +363,10 @@ func RevokeCertAndRegenerateCRL(root, parent, name string) {
log.Fatal(err)
}

var crlNumber big.Int
newCrl, err := x509.CreateRevocationList(rand.Reader, &x509.RevocationList{
RevokedCertificates: revoked,
Number: big.NewInt(int64(crlList.TBSCertList.Version) + 1),
Number: crlNumber.Add(crlList.Number, big.NewInt(1)),
}, caCert, caKey.(crypto.Signer))
if err != nil {
log.Fatal(err)
Expand Down
15 changes: 7 additions & 8 deletions go/vt/vttls/crl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package vttls

import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"fmt"
"os"
Expand All @@ -29,12 +28,12 @@ import (

type verifyPeerCertificateFunc func([][]byte, [][]*x509.Certificate) error

func certIsRevoked(cert *x509.Certificate, crl *pkix.CertificateList) bool {
if crl.HasExpired(time.Now()) {
func certIsRevoked(cert *x509.Certificate, crl *x509.RevocationList) bool {
if !time.Now().Before(crl.NextUpdate) {
log.Warningf("The current Certificate Revocation List (CRL) is past expiry date and must be updated. Revoked certificates will still be rejected in this state.")
}

for _, revoked := range crl.TBSCertList.RevokedCertificates {
for _, revoked := range crl.RevokedCertificates {
if cert.SerialNumber.Cmp(revoked.SerialNumber) == 0 {
return true
}
Expand All @@ -54,7 +53,7 @@ func verifyPeerCertificateAgainstCRL(crl string) (verifyPeerCertificateFunc, err
cert := chain[i]
issuerCert := chain[i+1]
for _, crl := range crlSet {
if issuerCert.CheckCRLSignature(crl) == nil {
if crl.CheckSignatureFrom(issuerCert) == nil {
if certIsRevoked(cert, crl) {
return fmt.Errorf("Certificate revoked: CommonName=%v", cert.Subject.CommonName)
}
Expand All @@ -66,13 +65,13 @@ func verifyPeerCertificateAgainstCRL(crl string) (verifyPeerCertificateFunc, err
}, nil
}

func loadCRLSet(crl string) ([]*pkix.CertificateList, error) {
func loadCRLSet(crl string) ([]*x509.RevocationList, error) {
body, err := os.ReadFile(crl)
if err != nil {
return nil, err
}

crlSet := make([]*pkix.CertificateList, 0)
crlSet := make([]*x509.RevocationList, 0)
for len(body) > 0 {
var block *pem.Block
block, body = pem.Decode(body)
Expand All @@ -83,7 +82,7 @@ func loadCRLSet(crl string) ([]*pkix.CertificateList, error) {
continue
}

parsedCRL, err := x509.ParseCRL(block.Bytes)
parsedCRL, err := x509.ParseRevocationList(block.Bytes)
Copy link
Copy Markdown
Member Author

@dbussink dbussink Feb 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PEM decoding here is already done explicitly so there's no user facing changes in the usage (still only PEM formatted CRLs are supported).

if err != nil {
return nil, err
}
Expand Down