Merge pull request #77 from ArtisanCloud/develop

feat(security): 兼容x509.ParsePKCS1PublicKey
ArtisanCloud · Apr 3, 2023 · 1dd9932 · 1dd9932
2 parents 1a09c0e + 09383d8
commit 1dd9932
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/security/encryption/rsa.go b/security/encryption/rsa.go
@@ -189,6 +189,14 @@ func (encryptor *RSAEncryptor) ParseRSAPublicKeyFromPEM(key []byte) (*rsa.Public
 	// Parse the key
 	var parsedKey interface{}
 	if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
+
+		// 兼容 x509.ParsePKCS1PublicKey的key
+		parsedKey, err = x509.ParsePKCS1PublicKey(block.Bytes)
+		if err == nil && parsedKey != nil {
+			return parsedKey.(*rsa.PublicKey), nil
+		}
+
+		// 尝试其他的证书格式 x509.ParseCertificate
 		if cert, err := x509.ParseCertificate(block.Bytes); err == nil {
 			parsedKey = cert.PublicKey
 		} else {