Skip to content

Commit b0245c2

Browse files
author
Anthony Scarpino
committedMar 25, 2020
8237219: Disable native SunEC implementation by default
Reviewed-by: weijun, mullan
·
jdk-25+17jdk-15-ga
1 parent b8f2b32 commit b0245c2

File tree

16 files changed

+160
-62
lines changed

16 files changed

+160
-62
lines changed
 

‎src/java.base/share/classes/module-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284
exports sun.security.action to
285285
java.desktop,
286286
java.security.jgss,
287+
jdk.crypto.ec,
287288
jdk.incubator.foreign;
288289
exports sun.security.internal.interfaces to
289290
jdk.crypto.cryptoki;

‎src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,9 @@
3535
import javax.crypto.spec.*;
3636

3737
import sun.security.util.ArrayUtil;
38+
import sun.security.util.CurveDB;
3839
import sun.security.util.ECUtil;
40+
import sun.security.util.NamedCurve;
3941
import sun.security.util.math.*;
4042
import sun.security.ec.point.*;
4143

@@ -165,11 +167,24 @@ protected byte[] engineGenerateSecret() throws IllegalStateException {
165167
if ((privateKey == null) || (publicKey == null)) {
166168
throw new IllegalStateException("Not initialized correctly");
167169
}
168-
170+
byte[] result;
169171
Optional<byte[]> resultOpt = deriveKeyImpl(privateKey, publicKey);
170-
byte[] result = resultOpt.orElseGet(
171-
() -> deriveKeyNative(privateKey, publicKey)
172-
);
172+
if (resultOpt.isPresent()) {
173+
result = resultOpt.get();
174+
} else {
175+
if (SunEC.isNativeDisabled()) {
176+
NamedCurve privNC = CurveDB.lookup(privateKey.getParams());
177+
NamedCurve pubNC = CurveDB.lookup(publicKey.getParams());
178+
throw new IllegalStateException(
179+
new InvalidAlgorithmParameterException("Legacy SunEC " +
180+
"curve disabled, one or both keys: " +
181+
"Private: " + ((privNC != null) ?
182+
privNC.toString() : " unknown") +
183+
", PublicKey:" + ((pubNC != null) ?
184+
pubNC.toString() : " unknown")));
185+
}
186+
result = deriveKeyNative(privateKey, publicKey);
187+
}
173188
publicKey = null;
174189
return result;
175190
}

‎src/jdk.crypto.ec/share/classes/sun/security/ec/ECDSASignature.java

+17
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,14 @@ protected byte[] engineSign() throws SignatureException {
463463
if (sigOpt.isPresent()) {
464464
sig = sigOpt.get();
465465
} else {
466+
if (SunEC.isNativeDisabled()) {
467+
NamedCurve nc = CurveDB.lookup(privateKey.getParams());
468+
throw new SignatureException(
469+
new InvalidAlgorithmParameterException(
470+
"Legacy SunEC curve disabled: " +
471+
(nc != null ? nc.toString()
472+
: "unknown")));
473+
}
466474
sig = signDigestNative(privateKey, digest, random);
467475
}
468476

@@ -491,6 +499,15 @@ protected boolean engineVerify(byte[] signature) throws SignatureException {
491499
if (verifyOpt.isPresent()) {
492500
return verifyOpt.get();
493501
} else {
502+
if (SunEC.isNativeDisabled()) {
503+
NamedCurve nc = CurveDB.lookup(publicKey.getParams());
504+
throw new SignatureException(
505+
new InvalidAlgorithmParameterException(
506+
"Legacy SunEC curve disabled: " +
507+
(nc != null ? nc.toString()
508+
: "unknown")));
509+
}
510+
494511
byte[] w;
495512
ECParameterSpec params = publicKey.getParams();
496513
// DER OID

‎src/jdk.crypto.ec/share/classes/sun/security/ec/ECKeyPairGenerator.java

+26-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
3333
import java.security.spec.ECParameterSpec;
3434
import java.security.spec.ECPoint;
3535
import java.security.spec.InvalidParameterSpecException;
36-
import java.security.spec.*;
3736
import java.util.Optional;
3837

3938
import sun.security.jca.JCAUtil;
@@ -121,14 +120,29 @@ public void initialize(AlgorithmParameterSpec params, SecureRandom random)
121120
private static void ensureCurveIsSupported(ECParameterSpec ecSpec)
122121
throws InvalidAlgorithmParameterException {
123122

123+
// Check if ecSpec is a valid curve
124124
AlgorithmParameters ecParams = ECUtil.getECParameters(null);
125-
byte[] encodedParams;
126125
try {
127126
ecParams.init(ecSpec);
128-
encodedParams = ecParams.getEncoded();
129127
} catch (InvalidParameterSpecException ex) {
130128
throw new InvalidAlgorithmParameterException(
131129
"Unsupported curve: " + ecSpec.toString());
130+
}
131+
132+
// Check if the java implementation supports this curve
133+
if (ECOperations.forParameters(ecSpec).isPresent()) {
134+
return;
135+
}
136+
137+
// Check if the native library supported this curve, if available
138+
if (SunEC.isNativeDisabled()) {
139+
throw new InvalidAlgorithmParameterException(
140+
"Unsupported curve: " + ecSpec.toString());
141+
}
142+
143+
byte[] encodedParams;
144+
try {
145+
encodedParams = ecParams.getEncoded();
132146
} catch (IOException ex) {
133147
throw new RuntimeException(ex);
134148
}
@@ -151,6 +165,14 @@ public KeyPair generateKeyPair() {
151165
if (kp.isPresent()) {
152166
return kp.get();
153167
}
168+
} catch (Exception ex) {
169+
throw new ProviderException(ex);
170+
}
171+
if (SunEC.isNativeDisabled()) {
172+
throw new ProviderException("Legacy SunEC curve disabled: " +
173+
params.toString());
174+
}
175+
try {
154176
return generateKeyPairNative(random);
155177
} catch (Exception ex) {
156178
throw new ProviderException(ex);

‎src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java

+50-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,17 @@
2525

2626
package sun.security.ec;
2727

28-
import java.util.*;
29-
import java.security.*;
28+
import java.security.AccessController;
29+
import java.security.InvalidParameterException;
30+
import java.security.NoSuchAlgorithmException;
31+
import java.security.PrivilegedAction;
32+
import java.security.Provider;
33+
import java.security.ProviderException;
34+
import java.util.Arrays;
35+
import java.util.Collection;
36+
import java.util.Collections;
37+
import java.util.HashMap;
38+
import java.util.List;
3039
import java.util.regex.Pattern;
3140
import sun.security.util.CurveDB;
3241
import sun.security.util.NamedCurve;
@@ -53,22 +62,36 @@ public final class SunEC extends Provider {
5362

5463
private static final long serialVersionUID = -2279741672933606418L;
5564

56-
// flag indicating whether the full EC implementation is present
57-
// (when native library is absent then fewer EC algorithms are available)
58-
private static boolean useFullImplementation = true;
65+
// This flag is true if the native library is disabled or not loaded.
66+
private static boolean disableNative = true;
67+
5968
static {
60-
try {
61-
AccessController.doPrivileged(new PrivilegedAction<Void>() {
62-
public Void run() {
63-
System.loadLibrary("sunec"); // check for native library
64-
return null;
65-
}
66-
});
67-
} catch (UnsatisfiedLinkError e) {
68-
useFullImplementation = false;
69+
String s = sun.security.action.GetPropertyAction.privilegedGetProperty(
70+
"jdk.sunec.disableNative");
71+
if (s != null && s.equalsIgnoreCase("false")) {
72+
disableNative = false;
73+
}
74+
75+
// If native is enabled, verify the library is available.
76+
if (!disableNative) {
77+
try {
78+
AccessController.doPrivileged(new PrivilegedAction<Void>() {
79+
public Void run() {
80+
System.loadLibrary("sunec"); // check for native library
81+
return null;
82+
}
83+
});
84+
} catch (UnsatisfiedLinkError e) {
85+
disableNative = true;
86+
}
6987
}
7088
}
7189

90+
// Check if native library support is disabled.
91+
static boolean isNativeDisabled() {
92+
return SunEC.disableNative;
93+
}
94+
7295
private static class ProviderService extends Provider.Service {
7396

7497
ProviderService(Provider p, String type, String algo, String cn) {
@@ -165,13 +188,13 @@ public SunEC() {
165188
"Sun Elliptic Curve provider (EC, ECDSA, ECDH)");
166189
AccessController.doPrivileged(new PrivilegedAction<Void>() {
167190
public Void run() {
168-
putEntries(useFullImplementation);
191+
putEntries();
169192
return null;
170193
}
171194
});
172195
}
173196

174-
void putEntries(boolean useFullImplementation) {
197+
void putEntries() {
175198
HashMap<String, String> ATTRS = new HashMap<>(3);
176199
ATTRS.put("ImplementedIn", "Software");
177200
String ecKeyClasses = "java.security.interfaces.ECPublicKey" +
@@ -194,8 +217,16 @@ void putEntries(boolean useFullImplementation) {
194217
StringBuilder names = new StringBuilder();
195218
Pattern nameSplitPattern = Pattern.compile(CurveDB.SPLIT_PATTERN);
196219

197-
Collection<? extends NamedCurve> supportedCurves =
198-
CurveDB.getSupportedCurves();
220+
Collection<? extends NamedCurve> supportedCurves;
221+
if (SunEC.isNativeDisabled()) {
222+
supportedCurves = Collections.unmodifiableList(List.of(
223+
CurveDB.lookup("secp256r1"),
224+
CurveDB.lookup("secp384r1"),
225+
CurveDB.lookup("secp521r1")));
226+
} else {
227+
supportedCurves = CurveDB.getSupportedCurves();
228+
}
229+
199230
for (NamedCurve namedCurve : supportedCurves) {
200231
if (!firstCurve) {
201232
names.append("|");
@@ -225,14 +256,6 @@ void putEntries(boolean useFullImplementation) {
225256

226257
putXDHEntries();
227258

228-
/*
229-
* Register the algorithms below only when the full ECC implementation
230-
* is available
231-
*/
232-
if (!useFullImplementation) {
233-
return;
234-
}
235-
236259
/*
237260
* Signature engines
238261
*/

‎test/jdk/java/security/KeyAgreement/KeyAgreementTest.java

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
3131
* this test file was covered before with JDK-4936763.
3232
* @run main/othervm -Djdk.crypto.KeyAgreement.legacyKDF=true KeyAgreementTest
3333
* DiffieHellman DH SunJCE
34+
* @run main/othervm -Djdk.sunec.disableNative=false KeyAgreementTest
35+
* ECDHNative EC SunEC
3436
* @run main KeyAgreementTest ECDH EC SunEC
3537
* @run main KeyAgreementTest XDH XDH SunEC
3638
*/
@@ -52,7 +54,12 @@ public static void main(String[] args) throws Exception {
5254
String kaAlgo = args[0];
5355
String kpgAlgo = args[1];
5456
String provider = args[2];
57+
System.out.println("Testing " + kaAlgo);
5558
AlgoSpec aSpec = AlgoSpec.valueOf(AlgoSpec.class, kaAlgo);
59+
// Switch kaAlgo to ECDH as it is used for algorithm names
60+
if (kaAlgo.equals("ECDHNative")) {
61+
kaAlgo = "ECDH";
62+
}
5663
List<AlgorithmParameterSpec> specs = aSpec.getAlgorithmParameterSpecs();
5764
for (AlgorithmParameterSpec spec : specs) {
5865
testKeyAgreement(provider, kaAlgo, kpgAlgo, spec);
@@ -69,7 +76,7 @@ private enum AlgoSpec {
6976
// "java.base/share/classes/sun/security/util/CurveDB.java"
7077
// and
7178
// "jdk.crypto.ec/share/native/libsunec/impl/ecdecode.c"
72-
ECDH(
79+
ECDHNative(
7380
// SEC2 prime curves
7481
"secp112r1", "secp112r2", "secp128r1", "secp128r2", "secp160k1",
7582
"secp160r1", "secp192k1", "secp192r1", "secp224k1", "secp224r1",
@@ -87,6 +94,7 @@ private enum AlgoSpec {
8794
"X9.62 c2tnb239v1", "X9.62 c2tnb239v2", "X9.62 c2tnb239v3",
8895
"X9.62 c2tnb359v1", "X9.62 c2tnb431r1"
8996
),
97+
ECDH("secp256r1", "secp384r1", "secp521r1"),
9098
XDH("X25519", "X448", "x25519"),
9199
// There is no curve for DiffieHellman
92100
DiffieHellman(new String[]{});
@@ -97,6 +105,7 @@ private AlgoSpec(String... curves) {
97105
// Generate AlgorithmParameterSpec for each KeyExchangeAlgorithm
98106
for (String crv : curves) {
99107
switch (this.name()) {
108+
case "ECDHNative":
100109
case "ECDH":
101110
specs.add(new ECGenParameterSpec(crv));
102111
break;
@@ -126,6 +135,13 @@ private static void testKeyAgreement(String provider, String kaAlgo,
126135

127136
KeyPairGenerator kpg = KeyPairGenerator.getInstance(kpgAlgo, provider);
128137
kpg.initialize(spec);
138+
if (spec instanceof ECGenParameterSpec) {
139+
System.out.println("Testing curve: " +
140+
((ECGenParameterSpec)spec).getName());
141+
} else if (spec instanceof NamedParameterSpec) {
142+
System.out.println("Testing curve: " +
143+
((NamedParameterSpec)spec).getName());
144+
}
129145
KeyPair kp1 = kpg.generateKeyPair();
130146
KeyPair kp2 = kpg.generateKeyPair();
131147

‎test/jdk/java/security/KeyAgreement/KeySizeTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,9 @@
3737
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 4096
3838
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 6144
3939
* @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 8192
40-
* @run main KeySizeTest ECDH SunEC EC 128
41-
* @run main KeySizeTest ECDH SunEC EC 192
42-
* @run main KeySizeTest ECDH SunEC EC 256
40+
* @run main/othervm -Djdk.sunec.disableNative=false KeySizeTest ECDH SunEC EC 128
41+
* @run main/othervm -Djdk.sunec.disableNative=false KeySizeTest ECDH SunEC EC 192
42+
* @run main/othervm KeySizeTest ECDH SunEC EC 256
4343
* @run main KeySizeTest XDH SunEC XDH 255
4444
* @run main KeySizeTest XDH SunEC XDH 448
4545
*/

‎test/jdk/jdk/security/jarsigner/Spec.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
3131
* jdk.jartool
3232
* jdk.crypto.ec
3333
* @build jdk.test.lib.util.JarUtils
34-
* @run main Spec
34+
* @run main/othervm -Djdk.sunec.disableNative=false Spec
3535
*/
3636

3737
import com.sun.jarsigner.ContentSigner;

‎test/jdk/sun/security/ec/ECDSAJavaVerify.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ static void debug() throws Exception {
100100
= launchingConnector.defaultArguments();
101101
arguments.get("main").setValue(ECDSAJavaVerify.class.getName());
102102
arguments.get("options").setValue(
103-
"-cp " + System.getProperty("test.classes"));
103+
"-cp " + System.getProperty("test.classes") +
104+
" -Djdk.sunec.disableNative=false");
104105
VirtualMachine vm = launchingConnector.launch(arguments);
105106

106107
MethodEntryRequest req = vm.eventRequestManager()

‎test/jdk/sun/security/ec/InvalidCurve.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525
* @test
2626
* @bug 8182999
2727
* @summary Ensure that SunEC behaves correctly for unsupported curves.
28-
* @run main InvalidCurve
28+
* @run main/othervm -Djdk.sunec.disableNative=false InvalidCurve
2929
*/
3030

3131
import java.security.*;

‎test/jdk/sun/security/ec/SignatureDigestTruncate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
3636
* group order.
3737
* @library /test/lib
3838
* @build jdk.test.lib.Convert
39-
* @run main SignatureDigestTruncate
39+
* @run main/othervm -Djdk.sunec.disableNative=false SignatureDigestTruncate
4040
*/
4141
public class SignatureDigestTruncate {
4242

‎test/jdk/sun/security/ec/TestEC.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
3737
* @library ../../../java/security/testlibrary
3838
* @library ../../../javax/net/ssl/TLSCommon
3939
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
40-
* @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
41-
* @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
40+
* @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" -Djdk.sunec.disableNative=false TestEC
41+
* @run main/othervm -Djava.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" -Djdk.sunec.disableNative=false TestEC
4242
*/
4343

4444
import java.security.NoSuchProviderException;

‎test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@
3030
* @library ../../../../java/security/testlibrary
3131
* @key randomness
3232
* @modules jdk.crypto.cryptoki
33-
* @run main/othervm ReadPKCS12
34-
* @run main/othervm ReadPKCS12 sm policy
33+
* @run main/othervm -Djdk.sunec.disableNative=false ReadPKCS12
34+
* @run main/othervm -Djdk.sunec.disableNative=false ReadPKCS12 sm policy
3535
*/
3636

3737
import java.io.BufferedReader;

‎test/jdk/sun/security/tools/keytool/GroupName.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public static void main(String[] args) throws Throwable {
6565
.shouldNotContain("Specifying -keysize for generating EC keys is deprecated");
6666
checkCurveName("e", "secp256r1");
6767

68-
gen("f", "-keyalg EC -groupname brainpoolP256r1")
68+
gen("f", "-J-Djdk.sunec.disableNative=false -keyalg EC -groupname brainpoolP256r1")
6969
.shouldHaveExitValue(0)
7070
.shouldNotContain("Specifying -keysize for generating EC keys is deprecated");
7171
checkCurveName("f", "brainpoolP256r1");

‎test/jdk/sun/security/tools/keytool/KeyAlg.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,9 @@ public static void main(String[] args) throws Exception {
4141
keytool("-printcert -file user.crt")
4242
.shouldMatch("Signature algorithm name:.*SHA1withECDSA")
4343
.shouldMatch("Subject Public Key Algorithm:.*1024.*RSA");
44-
keytool("-genkeypair -alias e -dname CN=e -keyalg EC -groupname brainpoolP256r1")
44+
keytool("-genkeypair -alias e -dname CN=e " +
45+
"-J-Djdk.sunec.disableNative=false -keyalg EC " +
46+
"-groupname brainpoolP256r1")
4547
.shouldContain("Generating 256 bit EC (brainpoolP256r1) key pair");
4648
keytool("-genkeypair -alias f -dname CN=f -keyalg EC")
4749
.shouldContain("Generating 256 bit EC (secp256r1) key pair");

‎test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -87,12 +87,13 @@ private static void check(String keyAlg, int keySize,
8787

8888
static OutputAnalyzer genkeypair(String alias, String options)
8989
throws Exception {
90-
String patchArg = "-J--patch-module=java.base="
90+
String patchArg = "-J-Djdk.sunec.disableNative=false " +
91+
"-J--patch-module=java.base="
9192
+ System.getProperty("test.classes")
9293
+ File.separator + "patches" + File.separator + "java.base"
9394
+ " -J--patch-module=jdk.crypto.ec="
9495
+ System.getProperty("test.classes")
95-
+ File.separator + "patches" + File.separator + "jdk.crypto.ec";;
96+
+ File.separator + "patches" + File.separator + "jdk.crypto.ec";
9697
return kt(patchArg + " -genkeypair -alias " + alias
9798
+ " -dname CN=" + alias + " " + options);
9899
}

0 commit comments

Comments
 (0)
Please sign in to comment.