diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-10-05 16:25:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 16:25:28 -0700 |
| commit | a467278a3f06f88f28a5075d6a2027c12ca4fdf9 (patch) | |
| tree | 271cdd6487a61e78bcc3d91f78da18c904f9a0ca /support | |
| parent | f7aab022dcbfcd8f27b409ab92b4bca4a84d0b8a (diff) | |
| parent | 8a81dbf2f44e9b6af155dc918945174f07dad7b9 (diff) | |
| download | libcore-a467278a3f06f88f28a5075d6a2027c12ca4fdf9.zip libcore-a467278a3f06f88f28a5075d6a2027c12ca4fdf9.tar.gz libcore-a467278a3f06f88f28a5075d6a2027c12ca4fdf9.tar.bz2 | |
am 8a81dbf2: am 1d2861f4: am 7d38fa0f: Merge "Test updates for new SecretKeyFactory.PBKDF2WithHmacSHA1 support" into gingerbread
Merge commit '8a81dbf2f44e9b6af155dc918945174f07dad7b9' into dalvik-dev
* commit '8a81dbf2f44e9b6af155dc918945174f07dad7b9':
Test updates for new SecretKeyFactory.PBKDF2WithHmacSHA1 support
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 296e2e0..452634c 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -370,9 +370,6 @@ public final class StandardNames extends Assert { // TODO add to JDKAlgorithmParameters perhaps as wrapper on PBES2Parameters // For now, can use AlgorithmParametersSpec javax.crypto.spec.PBEParameterSpec instead unprovide("AlgorithmParameters", "PBEWithMD5AndDES"); // 1.2.840.113549.1.5.3 - - // missing from Bouncy Castle - unprovide("SecretKeyFactory", "PBKDF2WithHmacSHA1"); } } |