Skip to content
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

Jump to bottom

Support old style CSR header #50

Merged
merged 1 commit into from
Apr 11, 2018
Merged

Support old style CSR header #50

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
5 changes: 3 additions & 2 deletions pkix/csr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import (
)

const (
csrPEMBlockType = "CERTIFICATE REQUEST"
csrPEMBlockType = "CERTIFICATE REQUEST"
oldCsrPEMBlockType = "NEW CERTIFICATE REQUEST"
)

var (
Expand Down Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions pkix/csr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down