Add additional aliases.
These aliases are provided by Bouncy Castle for these algorithms, so we're
adding them as well so that anyone using them can get the Conscrypt
versions without having to change their code.
Bug: 7148552
Test: cts -m CtsLibcoreTestCases
Change-Id: I4fda059224f58e773c9249cb7fdcc81a0e198c48
diff --git a/common/src/main/java/org/conscrypt/OpenSSLProvider.java b/common/src/main/java/org/conscrypt/OpenSSLProvider.java
index bb93842..829c169 100644
--- a/common/src/main/java/org/conscrypt/OpenSSLProvider.java
+++ b/common/src/main/java/org/conscrypt/OpenSSLProvider.java
@@ -99,16 +99,22 @@
/* == KeyPairGenerators == */
put("KeyPairGenerator.RSA", PREFIX + "OpenSSLRSAKeyPairGenerator");
put("Alg.Alias.KeyPairGenerator.1.2.840.113549.1.1.1", "RSA");
+ put("Alg.Alias.KeyPairGenerator.1.2.840.113549.1.1.7", "RSA");
+ put("Alg.Alias.KeyPairGenerator.2.5.8.1.1", "RSA");
put("KeyPairGenerator.EC", PREFIX + "OpenSSLECKeyPairGenerator");
put("Alg.Alias.KeyPairGenerator.1.2.840.10045.2.1", "EC");
+ put("Alg.Alias.KeyPairGenerator.1.3.133.16.840.63.0.2", "EC");
/* == KeyFactory == */
put("KeyFactory.RSA", PREFIX + "OpenSSLRSAKeyFactory");
put("Alg.Alias.KeyFactory.1.2.840.113549.1.1.1", "RSA");
+ put("Alg.Alias.KeyFactory.1.2.840.113549.1.1.7", "RSA");
+ put("Alg.Alias.KeyFactory.2.5.8.1.1", "RSA");
put("KeyFactory.EC", PREFIX + "OpenSSLECKeyFactory");
put("Alg.Alias.KeyFactory.1.2.840.10045.2.1", "EC");
+ put("Alg.Alias.KeyFactory.1.3.133.16.840.63.0.2", "EC");
/* == KeyAgreement == */
putECDHKeyAgreementImplClass("OpenSSLECDHKeyAgreement");
@@ -118,6 +124,7 @@
put("Alg.Alias.Signature.MD5WithRSAEncryption", "MD5WithRSA");
put("Alg.Alias.Signature.MD5/RSA", "MD5WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.4", "MD5WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.4", "MD5WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.2.5with1.2.840.113549.1.1.1", "MD5WithRSA");
putSignatureImplClass("SHA1WithRSA", "OpenSSLSignature$SHA1RSA");
@@ -125,13 +132,17 @@
put("Alg.Alias.Signature.SHA1/RSA", "SHA1WithRSA");
put("Alg.Alias.Signature.SHA-1/RSA", "SHA1WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.5", "SHA1WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.5", "SHA1WithRSA");
put("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.113549.1.1.1", "SHA1WithRSA");
put("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.113549.1.1.5", "SHA1WithRSA");
put("Alg.Alias.Signature.1.3.14.3.2.29", "SHA1WithRSA");
+ put("Alg.Alias.Signature.OID.1.3.14.3.2.29", "SHA1WithRSA");
putSignatureImplClass("SHA224WithRSA", "OpenSSLSignature$SHA224RSA");
put("Alg.Alias.Signature.SHA224WithRSAEncryption", "SHA224WithRSA");
+ put("Alg.Alias.Signature.SHA224/RSA", "SHA224WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.14", "SHA224WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.14", "SHA224WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.4with1.2.840.113549.1.1.1",
"SHA224WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.4with1.2.840.113549.1.1.14",
@@ -139,7 +150,9 @@
putSignatureImplClass("SHA256WithRSA", "OpenSSLSignature$SHA256RSA");
put("Alg.Alias.Signature.SHA256WithRSAEncryption", "SHA256WithRSA");
+ put("Alg.Alias.Signature.SHA256/RSA", "SHA256WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.11", "SHA256WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.11", "SHA256WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.1with1.2.840.113549.1.1.1",
"SHA256WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.1with1.2.840.113549.1.1.11",
@@ -147,13 +160,17 @@
putSignatureImplClass("SHA384WithRSA", "OpenSSLSignature$SHA384RSA");
put("Alg.Alias.Signature.SHA384WithRSAEncryption", "SHA384WithRSA");
+ put("Alg.Alias.Signature.SHA384/RSA", "SHA384WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.12", "SHA384WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.12", "SHA384WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.2with1.2.840.113549.1.1.1",
"SHA384WithRSA");
putSignatureImplClass("SHA512WithRSA", "OpenSSLSignature$SHA512RSA");
put("Alg.Alias.Signature.SHA512WithRSAEncryption", "SHA512WithRSA");
+ put("Alg.Alias.Signature.SHA512/RSA", "SHA512WithRSA");
put("Alg.Alias.Signature.1.2.840.113549.1.1.13", "SHA512WithRSA");
+ put("Alg.Alias.Signature.OID.1.2.840.113549.1.1.13", "SHA512WithRSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.3with1.2.840.113549.1.1.1",
"SHA512WithRSA");
@@ -168,24 +185,32 @@
// iso(1) member-body(2) us(840) ansi-x962(10045) signatures(4) ecdsa-with-SHA2(3)
putSignatureImplClass("SHA224withECDSA", "OpenSSLSignature$SHA224ECDSA");
+ put("Alg.Alias.Signature.SHA224/ECDSA", "SHA224withECDSA");
// ecdsa-with-SHA224(1)
put("Alg.Alias.Signature.1.2.840.10045.4.3.1", "SHA224withECDSA");
+ put("Alg.Alias.Signature.OID.1.2.840.10045.4.3.1", "SHA224withECDSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.4with1.2.840.10045.2.1", "SHA224withECDSA");
// iso(1) member-body(2) us(840) ansi-x962(10045) signatures(4) ecdsa-with-SHA2(3)
putSignatureImplClass("SHA256withECDSA", "OpenSSLSignature$SHA256ECDSA");
+ put("Alg.Alias.Signature.SHA256/ECDSA", "SHA256withECDSA");
// ecdsa-with-SHA256(2)
put("Alg.Alias.Signature.1.2.840.10045.4.3.2", "SHA256withECDSA");
+ put("Alg.Alias.Signature.OID.1.2.840.10045.4.3.2", "SHA256withECDSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.1with1.2.840.10045.2.1", "SHA256withECDSA");
putSignatureImplClass("SHA384withECDSA", "OpenSSLSignature$SHA384ECDSA");
+ put("Alg.Alias.Signature.SHA384/ECDSA", "SHA384withECDSA");
// ecdsa-with-SHA384(3)
put("Alg.Alias.Signature.1.2.840.10045.4.3.3", "SHA384withECDSA");
+ put("Alg.Alias.Signature.OID.1.2.840.10045.4.3.3", "SHA384withECDSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.2with1.2.840.10045.2.1", "SHA384withECDSA");
putSignatureImplClass("SHA512withECDSA", "OpenSSLSignature$SHA512ECDSA");
+ put("Alg.Alias.Signature.SHA512/ECDSA", "SHA512withECDSA");
// ecdsa-with-SHA512(4)
put("Alg.Alias.Signature.1.2.840.10045.4.3.4", "SHA512withECDSA");
+ put("Alg.Alias.Signature.OID.1.2.840.10045.4.3.4", "SHA512withECDSA");
put("Alg.Alias.Signature.2.16.840.1.101.3.4.2.3with1.2.840.10045.2.1", "SHA512withECDSA");
putSignatureImplClass("SHA1withRSA/PSS", "OpenSSLSignature$SHA1RSAPSS");
@@ -306,10 +331,17 @@
put("Alg.Alias.Cipher.DESEDE/CBC/PKCS7Padding", "DESEDE/CBC/PKCS5Padding");
putSymmetricCipherImplClass("ARC4", "OpenSSLCipher$EVP_CIPHER$ARC4");
+ put("Alg.Alias.Cipher.ARCFOUR", "ARC4");
+ put("Alg.Alias.Cipher.RC4", "ARC4");
+ put("Alg.Alias.Cipher.1.2.840.113549.3.4", "ARC4");
+ put("Alg.Alias.Cipher.OID.1.2.840.113549.3.4", "ARC4");
if (NativeConstants.HAS_EVP_AEAD) {
putSymmetricCipherImplClass("AES/GCM/NoPadding", "OpenSSLCipher$EVP_AEAD$AES$GCM");
put("Alg.Alias.Cipher.GCM", "AES/GCM/NoPadding");
+ put("Alg.Alias.Cipher.2.16.840.1.101.3.4.1.6", "AES/GCM/NoPadding");
+ put("Alg.Alias.Cipher.2.16.840.1.101.3.4.1.26", "AES/GCM/NoPadding");
+ put("Alg.Alias.Cipher.2.16.840.1.101.3.4.1.46", "AES/GCM/NoPadding");
putSymmetricCipherImplClass(
"AES_128/GCM/NoPadding", "OpenSSLCipher$EVP_AEAD$AES$GCM$AES_128");
putSymmetricCipherImplClass(
@@ -319,6 +351,9 @@
/* === Mac === */
putMacImplClass("HmacMD5", "OpenSSLMac$HmacMD5");
+ put("Alg.Alias.Mac.1.3.6.1.5.5.8.1.1", "HmacMD5");
+ put("Alg.Alias.Mac.HMAC-MD5", "HmacMD5");
+ put("Alg.Alias.Mac.HMAC/MD5", "HmacMD5");
// PKCS#2 - iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2)
// http://www.oid-info.com/get/1.2.840.113549.2
@@ -326,6 +361,7 @@
// HMAC-SHA-1 PRF (7)
putMacImplClass("HmacSHA1", "OpenSSLMac$HmacSHA1");
put("Alg.Alias.Mac.1.2.840.113549.2.7", "HmacSHA1");
+ put("Alg.Alias.Mac.1.3.6.1.5.5.8.1.2", "HmacSHA1");
put("Alg.Alias.Mac.HMAC-SHA1", "HmacSHA1");
put("Alg.Alias.Mac.HMAC/SHA1", "HmacSHA1");
@@ -334,24 +370,29 @@
put("Alg.Alias.Mac.1.2.840.113549.2.8", "HmacSHA224");
put("Alg.Alias.Mac.HMAC-SHA224", "HmacSHA224");
put("Alg.Alias.Mac.HMAC/SHA224", "HmacSHA224");
+ put("Alg.Alias.Mac.PBEWITHHMACSHA224", "HmacSHA224");
// id-hmacWithSHA256 (9)
putMacImplClass("HmacSHA256", "OpenSSLMac$HmacSHA256");
put("Alg.Alias.Mac.1.2.840.113549.2.9", "HmacSHA256");
+ put("Alg.Alias.Mac.2.16.840.1.101.3.4.2.1", "HmacSHA256");
put("Alg.Alias.Mac.HMAC-SHA256", "HmacSHA256");
put("Alg.Alias.Mac.HMAC/SHA256", "HmacSHA256");
+ put("Alg.Alias.Mac.PBEWITHHMACSHA256", "HmacSHA256");
// id-hmacWithSHA384 (10)
putMacImplClass("HmacSHA384", "OpenSSLMac$HmacSHA384");
put("Alg.Alias.Mac.1.2.840.113549.2.10", "HmacSHA384");
put("Alg.Alias.Mac.HMAC-SHA384", "HmacSHA384");
put("Alg.Alias.Mac.HMAC/SHA384", "HmacSHA384");
+ put("Alg.Alias.Mac.PBEWITHHMACSHA384", "HmacSHA384");
// id-hmacWithSHA384 (11)
putMacImplClass("HmacSHA512", "OpenSSLMac$HmacSHA512");
put("Alg.Alias.Mac.1.2.840.113549.2.11", "HmacSHA512");
put("Alg.Alias.Mac.HMAC-SHA512", "HmacSHA512");
put("Alg.Alias.Mac.HMAC/SHA512", "HmacSHA512");
+ put("Alg.Alias.Mac.PBEWITHHMACSHA512", "HmacSHA512");
/* === Certificate === */
