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

Allow usage of root CA without a key. Fixes #6290 #6298

Merged
merged 3 commits into from
May 7, 2024
Merged

Allow usage of root CA without a key. Fixes #6290 #6298

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7079b64
Allow usage of root CA without a key. Fixes #6290
apollo13 May 3, 2024
c2dca8d
Update modules/caddypki/crypto.go
mholt May 7, 2024
72ed169
Merge branch 'master' into no-root-key
mholt May 7, 2024
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
19 changes: 11 additions & 8 deletions modules/caddypki/crypto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,21 @@ func (kp KeyPair) Load() (*x509.Certificate, crypto.Signer, error) {
if err != nil {
return nil, nil, err
}
keyData, err := os.ReadFile(kp.PrivateKey)
if err != nil {
return nil, nil, err
}

cert, err := pemDecodeSingleCert(certData)
if err != nil {
return nil, nil, err
}
key, err := certmagic.PEMDecodePrivateKey(keyData)
if err != nil {
return nil, nil, err

var key crypto.Signer
if kp.PrivateKey != "" {
keyData, err := os.ReadFile(kp.PrivateKey)
if err != nil {
return nil, nil, err
}
key, err = certmagic.PEMDecodePrivateKey(keyData)
if err != nil {
return nil, nil, err
}
}

return cert, key, nil
Expand Down
Loading