summaryrefslogtreecommitdiffstats
path: root/support/src
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-06-03 14:50:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-03 14:50:06 -0700
commit07064a72e165536c708ceffe5b4d59bfffd25d5d (patch)
tree26788a2b8a81b77589fc850adabbc144fa261bed /support/src
parent9a272f433da746ae356e9e779943d45c8e96ff99 (diff)
parent0897c6055311bf665365cbb8cae46aadc18d4d45 (diff)
downloadlibcore-07064a72e165536c708ceffe5b4d59bfffd25d5d.zip
libcore-07064a72e165536c708ceffe5b4d59bfffd25d5d.tar.gz
libcore-07064a72e165536c708ceffe5b4d59bfffd25d5d.tar.bz2
am 0897c605: Merge "PBKDF2 tests to exercise new, correct PBE implementation."
* commit '0897c6055311bf665365cbb8cae46aadc18d4d45': PBKDF2 tests to exercise new, correct PBE implementation.
Diffstat (limited to 'support/src')
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java1
1 files changed, 1 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 ae25352..6b42a2e 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -212,6 +212,7 @@ public final class StandardNames extends Assert {
provide("SecretKeyFactory", "PBEWithSHA1AndDESede");
provide("SecretKeyFactory", "PBEWithSHA1AndRC2_40");
provide("SecretKeyFactory", "PBKDF2WithHmacSHA1");
+ provide("SecretKeyFactory", "PBKDF2WithHmacSHA1And8bit");
provide("SecureRandom", "SHA1PRNG");
provide("Signature", "MD2withRSA");
provide("Signature", "MD5withRSA");