summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/caddypki/crypto.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/caddypki/crypto.go b/modules/caddypki/crypto.go
index d8e72c6..dbc6f38 100644
--- a/modules/caddypki/crypto.go
+++ b/modules/caddypki/crypto.go
@@ -81,6 +81,9 @@ func pemEncodePrivateKey(key crypto.PrivateKey) ([]byte, error) {
// TODO: this is the same thing as in certmagic. Should we reuse that code somehow? It's unexported.
func pemDecodePrivateKey(keyPEMBytes []byte) (crypto.PrivateKey, error) {
keyBlockDER, _ := pem.Decode(keyPEMBytes)
+ if keyBlockDER == nil {
+ return nil, fmt.Errorf("no PEM data found")
+ }
if keyBlockDER.Type != "PRIVATE KEY" && !strings.HasSuffix(keyBlockDER.Type, " PRIVATE KEY") {
return nil, fmt.Errorf("unknown PEM header %q", keyBlockDER.Type)