summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2016-10-20 17:20:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-10-20 17:20:19 +0000
commitc8e523784063ff26f67cc60483e58af42fc59ce0 (patch)
treeebbe3f2bca5db473514186b887e14272c5762c77 /support
parent859391ac33730f23dae23e005723c810a91eade4 (diff)
parentf3203f2d212279300ebd7f4a43ae323580d77812 (diff)
Merge "bouncycastle: add support for PKCS5S2 algorithm parameters"
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java20
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 42faad74f0..4c1660172f 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -166,6 +166,26 @@ public final class StandardNames extends Assert {
provide("AlgorithmParameters", "PBEWithSHA1AndRC2_40");
provide("AlgorithmParameters", "PSS");
provide("AlgorithmParameters", "RC2");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA1ANDAES_128");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA1ANDAES_256");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA224ANDAES_128");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA224ANDAES_256");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA256ANDAES_128");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA256ANDAES_256");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA384ANDAES_128");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA384ANDAES_256");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA512ANDAES_128");
+ provide("AlgorithmParameters", "PBEWITHHMACSHA512ANDAES_256");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA1ANDAES_128");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA1ANDAES_256");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA224ANDAES_128");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA224ANDAES_256");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA256ANDAES_128");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA256ANDAES_256");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA384ANDAES_128");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA384ANDAES_256");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA512ANDAES_128");
+ provide("SecretKeyFactory", "PBEWITHHMACSHA512ANDAES_256");
provide("CertPathBuilder", "PKIX");
provide("CertPathValidator", "PKIX");
provide("CertStore", "Collection");