alexvanin/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

Fix PEM decoding if file ends with multiple newlines

Browse source 
This method more closely reflects how crypto/tls does it here: https://golang.org/src/crypto/tls/tls.go?s=5139:5210#L174
This commit is contained in:
Matthew Holt 2016-01-11 10:02:28 -07:00
parent 1369fa9f3c
commit 19ea2cbf75
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
acme/crypto.go
View file

@ -177,22 +177,21 @@ func performECDH(priv *ecdsa.PrivateKey, pub *ecdsa.PublicKey, outLen int, label
// a slice of x509 certificates. This function will error if no certificates are found. // a slice of x509 certificates. This function will error if no certificates are found.
func parsePEMBundle(bundle []byte) ([]*x509.Certificate, error) { func parsePEMBundle(bundle []byte) ([]*x509.Certificate, error) {
var certificates []*x509.Certificate var certificates []*x509.Certificate
var certDERBlock *pem.Block
remaining := bundle for {
for len(remaining) != 0 { certDERBlock, bundle = pem.Decode(bundle)
certBlock, rem := pem.Decode(remaining) if certDERBlock == nil {
// Thanks golang for having me do this :[ break
remaining = rem
if certBlock == nil {
return nil, errors.New("Could not decode certificate.")
} }
cert, err := x509.ParseCertificate(certBlock.Bytes) if certDERBlock.Type == "CERTIFICATE" {
if err != nil { cert, err := x509.ParseCertificate(certDERBlock.Bytes)
return nil, err if err != nil {
return nil, err
}
certificates = append(certificates, cert)
} }
certificates = append(certificates, cert)
} }
if len(certificates) == 0 { if len(certificates) == 0 {