Skip to content

Commit c97292b

Browse files
apollo13mholt
andauthored
caddypki: Allow use of root CA without a key. Fixes #6290 (#6298)
* Allow usage of root CA without a key. Fixes #6290 * Update modules/caddypki/crypto.go --------- Co-authored-by: Matt Holt <[email protected]>
1 parent b522710 commit c97292b

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

modules/caddypki/crypto.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,21 @@ func (kp KeyPair) Load() (*x509.Certificate, crypto.Signer, error) {
7878
if err != nil {
7979
return nil, nil, err
8080
}
81-
keyData, err := os.ReadFile(kp.PrivateKey)
82-
if err != nil {
83-
return nil, nil, err
84-
}
85-
8681
cert, err := pemDecodeSingleCert(certData)
8782
if err != nil {
8883
return nil, nil, err
8984
}
90-
key, err := certmagic.PEMDecodePrivateKey(keyData)
91-
if err != nil {
92-
return nil, nil, err
85+
86+
var key crypto.Signer
87+
if kp.PrivateKey != "" {
88+
keyData, err := os.ReadFile(kp.PrivateKey)
89+
if err != nil {
90+
return nil, nil, err
91+
}
92+
key, err = certmagic.PEMDecodePrivateKey(keyData)
93+
if err != nil {
94+
return nil, nil, err
95+
}
9396
}
9497

9598
return cert, key, nil

0 commit comments

Comments
 (0)