caddypki: Return error if no PEM data found

Best guess for https://caddy.community/t/on-fly-certificate-generation-based-on-sni/14639/4
caddyserver · Jan 7, 2022 · c634bbe · c634bbe · simaotwx · Jan 11, 2022
1 parent 4b9849c
commit c634bbe
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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)