commit 3592cd2135a96441acd631ce97d0bdc4ab6f995e
author Kenny Root <kroot@google.com> Tue May 12 10:03:53 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 04 14:38:31 2015 -0700
tree d418613b324e653f8d26254861605e858dc88873
parent ab9d33b656167ebfe17b08f306f97610cd42344e

No need to test EC keys of 192 bits

EC keys of 192 bits have a security level of 96 bits which is well
below accepted minimum levels according to NIST SP800 131A. No need
to be able to generate these anymore. Instead test 521-bit EC keys.

(cherry picked from commit 9b8f9a1bb00f70f79f175282969d428d2aade062)

Bug: 20563457
Change-Id: I674c255c55c910bb8f9ccdf1e5ad7f69a2bdac69

luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java

diff --git a/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java b/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
index 7e08b5f..1320a8a 100644
--- a/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
+++ b/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
@@ -45,6 +45,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import javax.crypto.interfaces.DHPrivateKey;
@@ -198,7 +199,6 @@
         putKeySize("DiffieHellman", 512);
         putKeySize("DiffieHellman", 512+64);
         putKeySize("DiffieHellman", 1024);
-        putKeySize("EC", 192);
         putKeySize("EC", 224);
         putKeySize("EC", 256);
         putKeySize("EC", 384);
@@ -207,10 +207,10 @@
 
     /** Elliptic Curve Crypto named curves that should be supported. */
     private static final String[] EC_NAMED_CURVES = {
-        // NIST P-192 aka SECG secp192r1 aka ANSI X9.62 prime192v1
-        "secp192r1", "prime192v1",
         // NIST P-256 aka SECG secp256r1 aka ANSI X9.62 prime256v1
         "secp256r1", "prime256v1",
+        // NIST P-521 aka SECG secp521r1
+        "secp521r1",
     };
 
     private void test_KeyPairGenerator(KeyPairGenerator kpg) throws Exception {
@@ -267,7 +267,7 @@
     }
 
     private void test_Key(KeyPairGenerator kpg, Key k) throws Exception {
-        String expectedAlgorithm = kpg.getAlgorithm().toUpperCase();
+        String expectedAlgorithm = kpg.getAlgorithm().toUpperCase(Locale.ROOT);
         if (StandardNames.IS_RI && expectedAlgorithm.equals("DIFFIEHELLMAN")) {
             expectedAlgorithm = "DH";
         }