Skip to content

Commit

Permalink
u
Browse files Browse the repository at this point in the history
  • Loading branch information
@JinhangZhang
JinhangZhang committed Jan 15, 2025
1 parent bd5f920 commit ccd1b31
Show file tree
Hide file tree
Showing 56 changed files with 212 additions and 177 deletions.
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/DTLS/CipherSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class CipherSuite extends DTLSOverDatagram {

public static void main(String[] args) throws Exception {
if (args.length > 1 && "re-enable".equals(args[1])
&& !(Utils.isFIPS())) {
&& !(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
}

Expand All @@ -75,7 +75,7 @@ public static void main(String[] args) throws Exception {
try {
testCase.runTest(testCase);
} catch (javax.net.ssl.SSLHandshakeException sslhe) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if(!SecurityUtils.TLS_CIPHERSUITES.containsKey(cipherSuite)) {
if ("No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(sslhe.getMessage())) {
System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/DTLS/DTLSWontNegotiateV10.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class DTLSWontNegotiateV10 {
public static void main(String[] args) throws Exception {

if (args[0].equals(DTLSV_1_0)
&& !(Utils.isFIPS())) {
&& !(SecurityUtils.isFIPS())) {
SecurityUtils.removeFromDisabledTlsAlgs(DTLSV_1_0);
}

Expand All @@ -77,7 +77,7 @@ public static void main(String[] args) throws Exception {
} catch (SocketTimeoutException exc) {
System.out.println("The server timed-out waiting for packets from the client.");
} catch (javax.net.ssl.SSLHandshakeException sslhe) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if(!SecurityUtils.TLS_PROTOCOLS.contains(args[0])) {
if ("No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(sslhe.getMessage())) {
System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/DTLS/WeakCipherSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class WeakCipherSuite extends DTLSOverDatagram {
public static void main(String[] args) throws Exception {
// reset security properties to make sure that the algorithms
// and keys used in this test are not disabled.
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
Security.setProperty("jdk.certpath.disabledAlgorithms", "");
}
Expand All @@ -66,7 +66,7 @@ public static void main(String[] args) throws Exception {
try {
testCase.runTest(testCase);
} catch (javax.net.ssl.SSLHandshakeException sslhe) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if(!SecurityUtils.TLS_CIPHERSUITES.containsKey(cipherSuite)) {
if ("No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(sslhe.getMessage())) {
System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
Expand Down
7 changes: 4 additions & 3 deletions test/jdk/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import javax.net.ssl.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class ImplicitHandshake {

Expand Down Expand Up @@ -194,9 +195,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}
System.setProperty("javax.net.ssl.keyStore", keyFilename);
System.setProperty("javax.net.ssl.keyStorePassword", passwd);
Expand Down
11 changes: 6 additions & 5 deletions test/jdk/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.security.cert.Certificate;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class CriticalSubjectAltName implements HostnameVerifier {
/*
Expand Down Expand Up @@ -162,7 +163,7 @@ void doClientSide() throws Exception {

public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.certpath.disabledAlgorithms",
"MD2, RSA keySize < 1024");
Security.setProperty("jdk.tls.disabledAlgorithms",
Expand All @@ -176,9 +177,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}

System.setProperty("javax.net.ssl.keyStore", keyFilename);
Expand All @@ -195,7 +196,7 @@ public static void main(String[] args) throws Exception {
try {
new CriticalSubjectAltName();
} catch (Exception e) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if (e instanceof java.security.cert.CertPathValidatorException) {
if ("Algorithm constraints check failed on signature algorithm: MD5withRSA".equals(e.getMessage())) {
System.out.println("MD5withRSA is not a supported signature algorithm.");
Expand Down
7 changes: 4 additions & 3 deletions test/jdk/javax/net/ssl/HttpsURLConnection/GetResponseCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.security.cert.Certificate;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class GetResponseCode implements HostnameVerifier {
/*
Expand Down Expand Up @@ -152,9 +153,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}

System.setProperty("javax.net.ssl.keyStore", keyFilename);
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/SSLEngine/Arrays.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public static void main(String args[]) throws Exception {
contextVersion = args[0];
// Re-enable context version if it is disabled.
// If context version is SSLv3, TLSv1 needs to be re-enabled.
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
if (contextVersion.equals("SSLv3")) {
SecurityUtils.removeFromDisabledTlsAlgs("TLSv1");
} else if (contextVersion.equals("TLSv1") ||
Expand All @@ -207,7 +207,7 @@ public static void main(String args[]) throws Exception {
try {
test.runTest();
} catch (javax.net.ssl.SSLHandshakeException sslhe) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if(!SecurityUtils.TLS_PROTOCOLS.contains(contextVersion)) {
if ("No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(sslhe.getMessage())) {
System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/SSLEngine/Basics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ public class Basics {
"/" + TRUSTSTORE_FILE;

public static void main(String[] args) throws Exception {
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
SecurityUtils.removeFromDisabledTlsAlgs("TLSv1.1");
runTest("TLSv1.1", "TLS_DHE_DSS_WITH_AES_128_CBC_SHA");
}

runTest("TLSv1.3", "TLS_AES_256_GCM_SHA384");
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
runTest("TLSv1.2", "TLS_RSA_WITH_AES_256_GCM_SHA384");
}
}
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/javax/net/ssl/SSLEngine/CheckTlsEngineResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.nio.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class CheckTlsEngineResults {

Expand Down Expand Up @@ -128,7 +129,7 @@ private void test() throws Exception {
SSLEngineResult result1; // clientEngine's results from last operation
SSLEngineResult result2; // serverEngine's results from last operation
String[] suite1;
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
suite1 = new String [] {
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA" };
} else {
Expand Down
3 changes: 2 additions & 1 deletion test/jdk/javax/net/ssl/SSLEngine/ConnectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.nio.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class ConnectionTest {

Expand Down Expand Up @@ -600,7 +601,7 @@ private static void log(Object msg) {
public static void main(String args[]) throws Exception {
// reset the security property to make sure that the algorithms
// and keys used in this test are not disabled.
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
}

Expand Down
3 changes: 2 additions & 1 deletion test/jdk/javax/net/ssl/SSLEngine/EngineCloseOnAlert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class EngineCloseOnAlert {

Expand All @@ -56,7 +57,7 @@ public class EngineCloseOnAlert {
private static KeyManagerFactory KMF;
private static TrustManagerFactory TMF;

private static final String[] ONECIPHER = (Utils.isFIPS()) ?
private static final String[] ONECIPHER = (SecurityUtils.isFIPS()) ?
new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" } : new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA" };


Expand Down
3 changes: 2 additions & 1 deletion test/jdk/javax/net/ssl/SSLEngine/LargeBufs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.Random;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class LargeBufs {

Expand Down Expand Up @@ -185,7 +186,7 @@ private void runTest(String cipher) throws Exception {
public static void main(String args[]) throws Exception {
LargeBufs test;

if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
// reset the security property to make sure that the algorithms
// and keys used in this test are not disabled.
Security.setProperty("jdk.tls.disabledAlgorithms", "");
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public class NoAuthClientAuth {
* Main entry point for this test.
*/
public static void main(String args[]) throws Exception {
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
tlsProtocol = args[0];
} else {
Expand All @@ -164,7 +164,7 @@ public static void main(String args[]) throws Exception {
try {
test.runTest();
} catch (java.lang.IllegalArgumentException iae) {
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
if (tlsProtocol == null) {
if ("Unsupported protocolnull".equals(iae.getMessage())) {
System.out.println("Expected exception msg: <Unsupported protocolnull> is caught");
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/javax/net/ssl/SSLEngine/TestAllSuites.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private void createSSLEngines() {
private void test() throws Exception {
List<String> tmpCipherSuites = new ArrayList<>();
String [] suites;
if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
for (String ciphersuite : clientEngine.getEnabledCipherSuites()) {
if (!SecurityUtils.TLS_CIPHERSUITES.containsKey(ciphersuite)) {
continue;
Expand Down Expand Up @@ -243,7 +243,7 @@ public static void main(String args[]) throws Exception {
if (args.length < 1) {
throw new RuntimeException("Missing TLS protocol parameter.");
}
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
switch(args[0]) {
case "TLSv1.1" -> SecurityUtils.removeFromDisabledTlsAlgs("TLSv1.1");
case "TLSv1.3" -> SecurityUtils.addToDisabledTlsAlgs("TLSv1.2");
Expand Down
11 changes: 6 additions & 5 deletions test/jdk/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.Arrays;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class UseCipherSuitesOrder {

Expand Down Expand Up @@ -177,7 +178,7 @@ private static void parseArguments(String[] args) throws Exception {
throw new Exception("Need to enable at least two cipher suites");
}

if (Utils.isFIPS()) {
if (SecurityUtils.isFIPS()) {
cliEnabledCipherSuites = new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"};
}

Expand All @@ -204,7 +205,7 @@ private static void parseArguments(String[] args) throws Exception {
public static void main(String[] args) throws Exception {
// reset the security property to make sure that the algorithms
// and keys used in this test are not disabled.
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
}

Expand All @@ -218,9 +219,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}

System.setProperty("javax.net.ssl.keyStore", keyFilename);
Expand Down
7 changes: 4 additions & 3 deletions test/jdk/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.security.cert.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class HttpsURLConnectionLocalCertificateChain
implements HandshakeCompletedListener,
Expand Down Expand Up @@ -247,9 +248,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}

System.setProperty("javax.net.ssl.keyStore", keyFilename);
Expand Down
9 changes: 5 additions & 4 deletions test/jdk/javax/net/ssl/SSLSession/JSSERenegotiate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import javax.net.ssl.*;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class JSSERenegotiate {

Expand Down Expand Up @@ -196,7 +197,7 @@ void doClientSide() throws Exception {
public static void main(String[] args) throws Exception {
// reset the security property to make sure that the cipher suites
// used in this test are not disabled
if (!(Utils.isFIPS())) {
if (!(SecurityUtils.isFIPS())) {
Security.setProperty("jdk.tls.disabledAlgorithms", "");
}

Expand All @@ -207,9 +208,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
suite1 = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256";
suite2 = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384";
} else {
Expand Down
7 changes: 4 additions & 3 deletions test/jdk/javax/net/ssl/SSLSession/RenegotiateTLS13.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import java.security.SecureRandom;

import jdk.test.lib.Utils;
import jdk.test.lib.security.SecurityUtils;

public class RenegotiateTLS13 {

Expand Down Expand Up @@ -142,9 +143,9 @@ public static void main(String[] args) throws Exception {
System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + trustStoreFile;

if (Utils.isFIPS()) {
keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
if (SecurityUtils.isFIPS()) {
keyFilename = SecurityUtils.revertJKSToPKCS12(keyFilename, passwd);
trustFilename = SecurityUtils.revertJKSToPKCS12(trustFilename, passwd);
}

System.setProperty("javax.net.ssl.keyStore", keyFilename);
Expand Down
Loading

0 comments on commit ccd1b31

Please sign in to comment.