From 89c6ac92228530d7c8bd3563e6316754190a27ed Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Wed, 17 Jun 2015 08:21:38 -0700 Subject: Add RSA-OAEP and RSA-PSS to StandardNames. This fixes libcore.java.security.ProviderTest#test_Provider_getServices which got broken by Android Keystore Provider exposing RSA encryption with RSA-OAEP padding scheme and RSA signatures with RSA-PSS padding scheme. Bug: 21870225 Change-Id: I661a333579a29b5ede2b517e1a020d73122bfffc --- .../src/test/java/libcore/java/security/StandardNames.java | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'support/src') 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"); -- cgit v1.1