diff options
| author | Kenny Root <kroot@google.com> | 2012-10-04 14:03:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-04 14:03:00 -0700 |
| commit | e64b5a175e94b477dc3275924f126eba30f7599a (patch) | |
| tree | 998b3b42b3ec0ddc076d2581217e0c277647c34a /support | |
| parent | 7558db461bfcb9ec7ca8f0ee3ab5f707b39c03d3 (diff) | |
| parent | 9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d (diff) | |
| download | libcore-e64b5a175e94b477dc3275924f126eba30f7599a.zip libcore-e64b5a175e94b477dc3275924f126eba30f7599a.tar.gz libcore-e64b5a175e94b477dc3275924f126eba30f7599a.tar.bz2 | |
am 9560ed5e: am 6ff99058: Merge "OpenSSLCipher: add Ciphers to StandardNames"
* commit '9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d':
OpenSSLCipher: add Ciphers to StandardNames
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 20 |
1 files changed, 20 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 4211a10..7a22c7e 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -426,6 +426,26 @@ public final class StandardNames extends Assert { provide("SecretKeyFactory", "PBEWITHSHAAND40BITRC4"); provide("SecretKeyFactory", "PBEWITHSHAANDTWOFISH-CBC"); + // Needed by our OpenSSL provider + provide("Cipher", "AES/CBC/NOPADDING"); + provide("Cipher", "AES/CBC/PKCS5PADDING"); + provide("Cipher", "AES/CFB/NOPADDING"); + provide("Cipher", "AES/CFB/PKCS5PADDING"); + provide("Cipher", "AES/CTR/NOPADDING"); + provide("Cipher", "AES/CTR/PKCS5PADDING"); + provide("Cipher", "AES/ECB/NOPADDING"); + provide("Cipher", "AES/ECB/PKCS5PADDING"); + provide("Cipher", "AES/OFB/NOPADDING"); + provide("Cipher", "AES/OFB/PKCS5PADDING"); + provide("Cipher", "DESEDE/CBC/NOPADDING"); + provide("Cipher", "DESEDE/CBC/PKCS5PADDING"); + provide("Cipher", "DESEDE/CFB/NOPADDING"); + provide("Cipher", "DESEDE/CFB/PKCS5PADDING"); + provide("Cipher", "DESEDE/ECB/NOPADDING"); + provide("Cipher", "DESEDE/ECB/PKCS5PADDING"); + provide("Cipher", "DESEDE/OFB/NOPADDING"); + provide("Cipher", "DESEDE/OFB/PKCS5PADDING"); + // removed LDAP unprovide("CertStore", "LDAP"); |