stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8253637: Update EC removal

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Anthony Scarpino 2020-09-29 18:05:20 +00:00
parent b1ce6bdba9
commit fb206908b4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
View File

@ -170,9 +170,10 @@ public final class ECDHKeyAgreement extends KeyAgreementSpi {
byte[] result; byte[] result;
Optional<byte[]> resultOpt = deriveKeyImpl(privateKey, publicKey); Optional<byte[]> resultOpt = deriveKeyImpl(privateKey, publicKey);
if (resultOpt.isEmpty()) { if (resultOpt.isEmpty()) {
NamedCurve nc = CurveDB.lookup(publicKey.getParams());
throw new IllegalStateException( throw new IllegalStateException(
new InvalidAlgorithmParameterException("Curve not supported: " + new InvalidAlgorithmParameterException("Curve not supported: " +
publicKey.getParams().toString())); (nc != null ? nc.toString() : "unknown")));
} }
result = resultOpt.get(); result = resultOpt.get();
publicKey = null; publicKey = null;

1
test/jdk/ProblemList.txt
View File

@ -704,7 +704,6 @@ javax/security/auth/kerberos/KerberosTixDateTest.java 8039280 generic-
sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
sun/security/provider/PolicyParser/ExtDirsChange.java 8039280 generic-all sun/security/provider/PolicyParser/ExtDirsChange.java 8039280 generic-all
sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
sun/security/ec/TestEC.java 8253637 linux-aarch64
############################################################################ ############################################################################

5
test/jdk/sun/security/ec/TestEC.java
View File

@ -37,8 +37,9 @@
* @library ../../../java/security/testlibrary * @library ../../../java/security/testlibrary
* @library ../../../javax/net/ssl/TLSCommon * @library ../../../javax/net/ssl/TLSCommon
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper * @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
* @run main/othervm -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,sect193r1" -Djdk.sunec.disableNative=false TestEC * @run main/othervm -Djava.security.policy=TestEC.policy
* -Djdk.tls.namedGroups="secp256r1" TestEC
*/ */
import java.security.NoSuchProviderException; import java.security.NoSuchProviderException;

2
test/jdk/sun/security/pkcs11/PKCS11Test.java
View File

@ -96,7 +96,7 @@ public abstract class PKCS11Test {
// NSS version info // NSS version info
public static enum ECCState { None, Basic, Extended }; public static enum ECCState { None, Basic, Extended };
static double nss_version = -1; 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() // The NSS library we need to search for in getNSSLibDir()
// Default is "libsoftokn3.so", listed as "softokn3" // Default is "libsoftokn3.so", listed as "softokn3"