diff options
| author | Kenny Root <kroot@google.com> | 2012-10-04 14:01:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-04 14:01:40 -0700 |
| commit | 9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d (patch) | |
| tree | f2db4ae832136a3e3184befccaa7050b921b2fbb /support | |
| parent | d26da2f66c9139280a7fbd434980b3bd8349b612 (diff) | |
| parent | 6ff99058e24d425bb36d57827aede925a8c0caa4 (diff) | |
| download | libcore-9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d.zip libcore-9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d.tar.gz libcore-9560ed5ed4229f17df8e09d9a40f4c8f30e68b0d.tar.bz2 | |
am 6ff99058: Merge "OpenSSLCipher: add Ciphers to StandardNames"
* commit '6ff99058e24d425bb36d57827aede925a8c0caa4':
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 f01a9b9..0ad0262 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -434,6 +434,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"); |