aipper/mkcert
1
0
Fork 0
mirror of https://github.com/FiloSottile/mkcert.git synced 2025-10-13 16:31:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Accept "NEW CERTIFICATE REQUEST" PEM headers

Browse Source 
Fixes #301
This commit is contained in:
Filippo Valsorda
2020-10-25 17:59:00 +01:00
parent 8e71a281f9
commit ea8260d0d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cert.go
View File

@@ -63,7 +63,7 @@ func (m *mkcert) makeCert(hosts []string) {
OrganizationalUnit: []string{userAndHostname}, OrganizationalUnit: []string{userAndHostname},
}, },
NotAfter: time.Now().AddDate(10, 0, 0), NotAfter: time.Now().AddDate(10, 0, 0),
// Fix the notBefore to temporarily bypass macOS Catalina's limit on // Fix the notBefore to temporarily bypass macOS Catalina's limit on
// certificate lifespan. Once mkcert provides an ACME server, automation // certificate lifespan. Once mkcert provides an ACME server, automation
@@ -208,7 +208,8 @@ func (m *mkcert) makeCertFromCSR() {
if csrPEM == nil { if csrPEM == nil {
log.Fatalln("ERROR: failed to read the CSR: unexpected content") log.Fatalln("ERROR: failed to read the CSR: unexpected content")
} }
if csrPEM.Type != "CERTIFICATE REQUEST" { if csrPEM.Type != "CERTIFICATE REQUEST" &&
csrPEM.Type != "NEW CERTIFICATE REQUEST" {
log.Fatalln("ERROR: failed to read the CSR: expected CERTIFICATE REQUEST, got " + csrPEM.Type) log.Fatalln("ERROR: failed to read the CSR: expected CERTIFICATE REQUEST, got " + csrPEM.Type)
} }
csr, err := x509.ParseCertificateRequest(csrPEM.Bytes) csr, err := x509.ParseCertificateRequest(csrPEM.Bytes)