Skip to content

Allow using RSA or EC private key when CA is provided #635

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

Open
a-bouts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow using RSA or EC private key when CA is provided #635

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
11 changes: 9 additions & 2 deletions cert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,17 @@ func (m *mkcert) loadCA() {
keyPEMBlock, err := ioutil.ReadFile(filepath.Join(m.CAROOT, rootKeyName))
fatalIfErr(err, "failed to read the CA key")
keyDERBlock, _ := pem.Decode(keyPEMBlock)
if keyDERBlock == nil || keyDERBlock.Type != "PRIVATE KEY" {
if keyDERBlock == nil || keyDERBlock.Type != "PRIVATE KEY" && keyDERBlock.Type != "RSA PRIVATE KEY" && keyDERBlock.Type != "EC PRIVATE KEY" {
log.Fatalln("ERROR: failed to read the CA key: unexpected content")
}
m.caKey, err = x509.ParsePKCS8PrivateKey(keyDERBlock.Bytes)
switch keyDERBlock.Type {
case "RSA PRIVATE KEY":
m.caKey, err = x509.ParsePKCS1PrivateKey(keyDERBlock.Bytes)
case "EC PRIVATE KEY":
m.caKey, err = x509.ParseECPrivateKey(keyDERBlock.Bytes)
default:
m.caKey, err = x509.ParsePKCS8PrivateKey(keyDERBlock.Bytes)
}
fatalIfErr(err, "failed to parse the CA key")
}

Expand Down