Merge pull request #15 from writeas/fix-key-decoding

Support decoding PKCS#8 keys
writeas · Nov 11, 2022 · b5516d2 · b5516d2
2 parents ab8ed5d + 73b029d
commit b5516d2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activitypub/keys.go b/activitypub/keys.go
@@ -69,8 +69,8 @@ func parsePublicKey(der []byte) (crypto.PublicKey, error) {
 // them in that order.
 func DecodePrivateKey(k []byte) (crypto.PrivateKey, error) {
 	block, _ := pem.Decode(k)
-	if block == nil || block.Type != "RSA PRIVATE KEY" {
-		return nil, fmt.Errorf("failed to decode PEM block containing private key")
+	if block == nil || (block.Type != "RSA PRIVATE KEY" && block.Type != "PRIVATE KEY") {
+		return nil, fmt.Errorf("failed to decode PEM block containing private key, type %s", block.Type)
 	}
 
 	return parsePrivateKey(block.Bytes)