diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-23 17:03:54 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-23 17:27:55 -0700 |
| commit | 48dfb27f884ddc5ada89c5b613d11a986f50513a (patch) | |
| tree | 65f77e730722131352c4eadc6387858b413a7b28 /support/src | |
| parent | 73035021c50c1450ec7c27d3bba63b6495f0c858 (diff) | |
| download | libcore-48dfb27f884ddc5ada89c5b613d11a986f50513a.zip libcore-48dfb27f884ddc5ada89c5b613d11a986f50513a.tar.gz libcore-48dfb27f884ddc5ada89c5b613d11a986f50513a.tar.bz2 | |
Restore PBE Ciphers and SecreyKeyFactories if underlying algorithm is supported for better PKCS12 support
This restores the Password Based Encryption (PBE) algorithms when we
were including the underlying algorithms used (3DES, AES, DES, MD5,
RC2, SHA1, SHA256)
Specficially we leave out PBE definitions that include algorithms such
as MD2, RIPEMD, Tiger that are not in our BouncyCastle jar.
Bug: 2942581
Change-Id: Ibef31aad56fc24b4db82a43a69153553660af65d
Diffstat (limited to 'support/src')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 6ee01b9..c03e826 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -301,12 +301,44 @@ public final class StandardNames extends Assert { provide("KeyStore", "BouncyCastle"); // Noise to support KeyStore.PKCS12 + provide("Cipher", "PBEWITHMD5AND128BITAES-CBC-OPENSSL"); + provide("Cipher", "PBEWITHMD5AND192BITAES-CBC-OPENSSL"); + provide("Cipher", "PBEWITHMD5AND256BITAES-CBC-OPENSSL"); + provide("Cipher", "PBEWITHMD5ANDRC2"); + provide("Cipher", "PBEWITHSHA1ANDDES"); + provide("Cipher", "PBEWITHSHA1ANDRC2"); + provide("Cipher", "PBEWITHSHA256AND128BITAES-CBC-BC"); + provide("Cipher", "PBEWITHSHA256AND192BITAES-CBC-BC"); + provide("Cipher", "PBEWITHSHA256AND256BITAES-CBC-BC"); + provide("Cipher", "PBEWITHSHAAND128BITAES-CBC-BC"); + provide("Cipher", "PBEWITHSHAAND128BITRC2-CBC"); + provide("Cipher", "PBEWITHSHAAND128BITRC4"); + provide("Cipher", "PBEWITHSHAAND192BITAES-CBC-BC"); + provide("Cipher", "PBEWITHSHAAND2-KEYTRIPLEDES-CBC"); + provide("Cipher", "PBEWITHSHAAND256BITAES-CBC-BC"); provide("Cipher", "PBEWITHSHAAND40BITRC2-CBC"); + provide("Cipher", "PBEWITHSHAAND40BITRC4"); provide("Cipher", "PBEWITHSHAANDTWOFISH-CBC"); provide("Mac", "PBEWITHHMACSHA"); provide("Mac", "PBEWITHHMACSHA1"); provide("SecretKeyFactory", "PBEWITHHMACSHA1"); + provide("SecretKeyFactory", "PBEWITHMD5AND128BITAES-CBC-OPENSSL"); + provide("SecretKeyFactory", "PBEWITHMD5AND192BITAES-CBC-OPENSSL"); + provide("SecretKeyFactory", "PBEWITHMD5AND256BITAES-CBC-OPENSSL"); + provide("SecretKeyFactory", "PBEWITHMD5ANDRC2"); + provide("SecretKeyFactory", "PBEWITHSHA1ANDDES"); + provide("SecretKeyFactory", "PBEWITHSHA1ANDRC2"); + provide("SecretKeyFactory", "PBEWITHSHA256AND128BITAES-CBC-BC"); + provide("SecretKeyFactory", "PBEWITHSHA256AND192BITAES-CBC-BC"); + provide("SecretKeyFactory", "PBEWITHSHA256AND256BITAES-CBC-BC"); + provide("SecretKeyFactory", "PBEWITHSHAAND128BITAES-CBC-BC"); + provide("SecretKeyFactory", "PBEWITHSHAAND128BITRC2-CBC"); + provide("SecretKeyFactory", "PBEWITHSHAAND128BITRC4"); + provide("SecretKeyFactory", "PBEWITHSHAAND192BITAES-CBC-BC"); + provide("SecretKeyFactory", "PBEWITHSHAAND2-KEYTRIPLEDES-CBC"); + provide("SecretKeyFactory", "PBEWITHSHAAND256BITAES-CBC-BC"); provide("SecretKeyFactory", "PBEWITHSHAAND40BITRC2-CBC"); + provide("SecretKeyFactory", "PBEWITHSHAAND40BITRC4"); provide("SecretKeyFactory", "PBEWITHSHAANDTWOFISH-CBC"); // removed LDAP |