8253637: Update EC removal

Reviewed-by: mullan
openjdk · Sep 29, 2020 · fb20690 · fb20690 · bridgekeeper · Sep 29, 2020
1 parent b1ce6bd
commit fb20690
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
@@ -170,9 +170,10 @@ protected byte[] engineGenerateSecret() throws IllegalStateException {
         byte[] result;
         Optional<byte[]> resultOpt = deriveKeyImpl(privateKey, publicKey);
         if (resultOpt.isEmpty()) {
+            NamedCurve nc = CurveDB.lookup(publicKey.getParams());
             throw new IllegalStateException(
                 new InvalidAlgorithmParameterException("Curve not supported: " +
-                    publicKey.getParams().toString()));
+                    (nc != null ? nc.toString() : "unknown")));
         }
         result = resultOpt.get();
         publicKey = null;

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -704,7 +704,6 @@ javax/security/auth/kerberos/KerberosTixDateTest.java           8039280 generic-
 sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
 sun/security/provider/PolicyParser/ExtDirsChange.java           8039280 generic-all
 sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
-sun/security/ec/TestEC.java                                     8253637 linux-aarch64
 
 ############################################################################
 

diff --git a/test/jdk/sun/security/ec/TestEC.java b/test/jdk/sun/security/ec/TestEC.java
@@ -37,8 +37,9 @@
  * @library ../../../java/security/testlibrary
  * @library ../../../javax/net/ssl/TLSCommon
  * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
- * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" -Djdk.sunec.disableNative=false TestEC
- * @run main/othervm -Djava.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" -Djdk.sunec.disableNative=false TestEC
+ * @run main/othervm -Djdk.tls.namedGroups="secp256r1" TestEC
+ * @run main/othervm -Djava.security.policy=TestEC.policy
+ *    -Djdk.tls.namedGroups="secp256r1" TestEC
  */
 
 import java.security.NoSuchProviderException;

diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -96,7 +96,7 @@ public abstract class PKCS11Test {
     // NSS version info
     public static enum ECCState { None, Basic, Extended };
     static double nss_version = -1;
-    static ECCState nss_ecc_status = ECCState.Extended;
+    static ECCState nss_ecc_status = ECCState.Basic;
 
     // The NSS library we need to search for in getNSSLibDir()
     // Default is "libsoftokn3.so", listed as "softokn3"