Merge pull request #50 from evenh/old-style-csr-header

Support old style CSR header
square · Apr 11, 2018 · 9ce254d · 9ce254d
2 parents fa1359e + 5a54f26
commit 9ce254d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/pkix/csr.go b/pkix/csr.go
@@ -35,7 +35,8 @@ import (
 )
 
 const (
-	csrPEMBlockType = "CERTIFICATE REQUEST"
+	csrPEMBlockType    = "CERTIFICATE REQUEST"
+	oldCsrPEMBlockType = "NEW CERTIFICATE REQUEST"
 )
 
 var (
@@ -121,7 +122,7 @@ func NewCertificateSigningRequestFromPEM(data []byte) (*CertificateSigningReques
 	if pemBlock == nil {
 		return nil, errors.New("cannot find the next PEM formatted block")
 	}
-	if pemBlock.Type != csrPEMBlockType || len(pemBlock.Headers) != 0 {
+	if (pemBlock.Type != csrPEMBlockType && pemBlock.Type != oldCsrPEMBlockType) || len(pemBlock.Headers) != 0 {
 		return nil, errors.New("unmatched type or headers")
 	}
 	return &CertificateSigningRequest{derBytes: pemBlock.Bytes}, nil

diff --git a/pkix/csr_test.go b/pkix/csr_test.go
@@ -36,6 +36,18 @@ hvcNAQEFBQADgYEAd6zCGoQHwqwcCtETtmEnlry1kienYt8WgMLU89HcJpSTUR7e
 1VfXfkS9MO5SUp9apPq0LIgT3ZcZwhFjgYmM9BTDUeMKT21FLnQbJ3C7xTTtSHQ6
 FlV5Hq5RkPqaigS6EmWl1zQrSZ4330jpt8y9J5rHGbsNwGlR+0xr34xqAYg=
 -----END CERTIFICATE REQUEST-----
+`
+	oldStyleCsrPEM = `-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIBqDCCARECAQAwaDELMAkGA1UEBhMCVVMxDzANBgNVBAcTBmZpZWxkMjESMBAG
+A1UEChMJY2VydHN0cmFwMQ8wDQYDVQQLEwZmb29iYXIxEjAQBgNVBAMTCTEyNy4w
+LjAuMTEPMA0GA1UECBMGZmllbGQ2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDPzdA4f6O1X81IiCIjoPfne4oYXcjl/vcC1le7G8Hk3r9AlyPG1KgZvh4YHOZo
+Qs9bJ9YKOEHsHIxrV7Mk7i4knlr9WNIRJydCpH+/DTv5ZbqlDbpi5K/DYS8ly5Zh
+DN6jyZ83+bwmpRUePZr/rXGzhGtLN8IKVww6UOi+yUH+iQIDAQABoAAwDQYJKoZI
+hvcNAQEFBQADgYEAd6zCGoQHwqwcCtETtmEnlry1kienYt8WgMLU89HcJpSTUR7e
+1VfXfkS9MO5SUp9apPq0LIgT3ZcZwhFjgYmM9BTDUeMKT21FLnQbJ3C7xTTtSHQ6
+FlV5Hq5RkPqaigS6EmWl1zQrSZ4330jpt8y9J5rHGbsNwGlR+0xr34xqAYg=
+-----END NEW CERTIFICATE REQUEST-----
 `
 	wrongCSRPEM = `-----BEGIN WRONG CERTIFICATE REQUEST-----
 MIIBgTCB7QIBADBGMQwwCgYDVQQGEwNVU0ExEDAOBgNVBAoTB2V0Y2QtY2ExEDAO
@@ -108,6 +120,25 @@ func TestCertificateSigningRequest(t *testing.T) {
 	}
 }
 
+func TestOldStyleCertificateSigningRequest(t *testing.T) {
+	csr, err := NewCertificateSigningRequestFromPEM([]byte(oldStyleCsrPEM))
+	if err != nil {
+		t.Fatal("Failed parsing certificate request from PEM:", err)
+	}
+
+	if err = csr.CheckSignature(); err != nil {
+		t.Fatal("Failed checking signature:", err)
+	}
+
+	pemBytes, err := csr.Export()
+	if err != nil {
+		t.Fatal("Failed exporting PEM-format bytes:", err)
+	}
+	if bytes.Compare(pemBytes, []byte(csrPEM)) != 0 {
+		t.Fatal("Failed exporting the same PEM-format bytes")
+	}
+}
+
 func TestWrongCertificateSigningRequest(t *testing.T) {
 	if _, err := NewCertificateSigningRequestFromPEM([]byte("-")); err == nil {
 		t.Fatal("Expect not to parse from PEM:", err)