summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-19 14:40:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-19 14:40:35 +0000
commitf28ba434b8050bf418a6913bb466e0b71dcb8195 (patch)
treeb09394f4acdfbc9de9bffc3117361c5a5294aa49
parent7ff8792c00d3ec7a127dace59caf7e5a00fe5c2a (diff)
parent89c6ac92228530d7c8bd3563e6316754190a27ed (diff)
downloadlibcore-f28ba434b8050bf418a6913bb466e0b71dcb8195.zip
libcore-f28ba434b8050bf418a6913bb466e0b71dcb8195.tar.gz
libcore-f28ba434b8050bf418a6913bb466e0b71dcb8195.tar.bz2
Merge "Add RSA-OAEP and RSA-PSS to StandardNames." into mnc-dev
-rw-r--r--support/src/test/java/libcore/java/security/StandardNames.java11
1 files changed, 11 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 017c466..cfd519a 100644
--- a/support/src/test/java/libcore/java/security/StandardNames.java
+++ b/support/src/test/java/libcore/java/security/StandardNames.java
@@ -393,12 +393,23 @@ public final class StandardNames extends Assert {
provide("Signature", "NONEwithRSA");
provide("Cipher", "RSA/ECB/NOPADDING");
provide("Cipher", "RSA/ECB/PKCS1PADDING");
+ provide("Cipher", "RSA/ECB/OAEPPadding");
+ provide("Cipher", "RSA/ECB/OAEPWithSHA-1AndMGF1Padding");
+ provide("Cipher", "RSA/ECB/OAEPWithSHA-224AndMGF1Padding");
+ provide("Cipher", "RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
+ provide("Cipher", "RSA/ECB/OAEPWithSHA-384AndMGF1Padding");
+ provide("Cipher", "RSA/ECB/OAEPWithSHA-512AndMGF1Padding");
provide("SecretKeyFactory", "AES");
provide("SecretKeyFactory", "HmacSHA1");
provide("SecretKeyFactory", "HmacSHA224");
provide("SecretKeyFactory", "HmacSHA256");
provide("SecretKeyFactory", "HmacSHA384");
provide("SecretKeyFactory", "HmacSHA512");
+ provide("Signature", "SHA1withRSA/PSS");
+ provide("Signature", "SHA224withRSA/PSS");
+ provide("Signature", "SHA256withRSA/PSS");
+ provide("Signature", "SHA384withRSA/PSS");
+ provide("Signature", "SHA512withRSA/PSS");
// different names: ARCFOUR vs ARC4
unprovide("Cipher", "ARCFOUR");