diff --git a/jck/jtrunner/JavaTestRunner.java b/jck/jtrunner/JavaTestRunner.java index 8c77898296..7c670489d0 100644 --- a/jck/jtrunner/JavaTestRunner.java +++ b/jck/jtrunner/JavaTestRunner.java @@ -377,7 +377,7 @@ public static boolean generateJTB() throws Exception { bw.close(); } - if ( getJckVersionInt(jckVersionNo) >= 11 && (tests.contains("api/java_net") || tests.contains("api/java_util")) ) { + if ( getJckVersionInt(jckVersionNo) >= 8 && (tests.contains("api/java_net") || tests.contains("api/java_util")) ) { // Requires SHA1 enabling for jar signers in jdk-11+ String secPropsContents = "jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024, include jdk.disabled.namedCurves\n"; secPropsContents += "jdk.certpath.disabledAlgorithms=MD2, MD5, SHA1 jdkCA & usage TLSServer, \\" + "\n"; @@ -1238,7 +1238,7 @@ private static boolean testsRequireDisplay (String tests) { private static String getTestSpecificJvmOptions(String jckVersion, String tests) { String testSpecificJvmOptions = ""; - if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || (getJckVersionInt(jckVersionNo) >= 11 && (tests.contains("api/java_net") || tests.contains("api/java_util"))) ) { + if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || (getJckVersionInt(jckVersionNo) >= 8 && (tests.contains("api/java_net") || tests.contains("api/java_util"))) ) { // Needs extra security.properties testSpecificJvmOptions += " -Djava.security.properties=" + secPropsFile; }