u

test/jdk/javax/net/ssl/DTLS/DTLSWontNegotiateV10.java

@@ -78,6 +78,13 @@ public static void main(String[] args) throws Exception {
  break;
  } 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() && !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");
+ return;
+ }
+ }
  }
  }
  if (tries == totalAttempts) {
@@ -102,15 +109,7 @@ private static void runServer(String protocol) throws Exception {
  clientProcess = builder.inheritIO().start();
  server.run();
  System.out.println("Success: DTLSv1.0 connection was not established.");
- // } catch (javax.net.ssl.SSLHandshakeException sslhe) {
- // if ((Utils.isFIPS() 
- // && Utils.getFipsProfile().equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS"))
- // && !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");
- // return;
- // }
- // }
+
  } finally {
  if (clientProcess != null) {
  clientProcess.destroy();

test/jdk/javax/net/ssl/SSLSession/JSSERenegotiate.java

@@ -225,7 +225,6 @@ public static void main(String[] args) throws Exception {
 
  if (debug)
  System.setProperty("javax.net.debug", "all");
-
  /*
  * Start the tests.
  */

test/jdk/javax/net/ssl/SSLSession/RenegotiateTLS13.java

@@ -63,8 +63,6 @@ public class RenegotiateTLS13 {
  // Server done flag
  static boolean done = false;
 
- static String keystoreType = System.getProperty("javax.net.ssl.keyStore");
-
  // Main server code
 
  void doServerSide() throws Exception {
@@ -148,7 +146,6 @@ public static void main(String[] args) throws Exception {
  if ((Utils.isFIPS() && Utils.getFipsProfile().equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS"))) {
  keyFilename = Utils.revertJKSToPKCS12(keyFilename, passwd);
  trustFilename = Utils.revertJKSToPKCS12(trustFilename, passwd);
- keystoreType = "PKCS12";
  }
 
  System.setProperty("javax.net.ssl.keyStore", keyFilename);
@@ -290,7 +287,7 @@ SSLContext initContext() throws Exception {
  System.out.println("Using TLS13");
  SSLContext sc = SSLContext.getInstance("TLSv1.3");
  KeyStore ks = KeyStore.getInstance(
- new File(keystoreType),
+ new File(System.getProperty("javax.net.ssl.keyStore")),
  passwd.toCharArray());
  KeyManagerFactory kmf = KeyManagerFactory.getInstance(
  KeyManagerFactory.getDefaultAlgorithm());

test/jdk/javax/net/ssl/SSLSession/ResumeTLS13withSNI.java

@@ -93,10 +93,10 @@ public static void main(String args[]) throws Exception {
  System.setProperty("javax.net.debug", "ssl:handshake");
  }
 
- if ((Utils.isFIPS() && Utils.getFipsProfile().equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS"))) {
- keyFilename = Utils.revertJKSToPKCS12(keyFilename, "passphrase");
- trustFilename = Utils.revertJKSToPKCS12(trustFilename, "passphrase");
- }
+ // if ((Utils.isFIPS() && Utils.getFipsProfile().equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS"))) {
+ //  keyFilename = Utils.revertJKSToPKCS12(keyFilename, "passphrase");
+ //  trustFilename = Utils.revertJKSToPKCS12(trustFilename, "passphrase");
+ // }
 
  KeyManagerFactory kmf = makeKeyManagerFactory(keyFilename,
  passphrase);

test/jdk/javax/net/ssl/ServerName/SSLSocketSNISensitive.java

@@ -254,6 +254,8 @@ public class SSLSocketSNISensitive {
  */
  static boolean debug = false;
 
+ static String[] signatureAlgos = new String[5];
+
  /*
  * Define the server side of the test.
  *
@@ -366,7 +368,7 @@ private static void parseArguments(String[] args) {
  clientRequestedHostname = args[1];
  }
 
- private static void printCert(String trustedCertStr) {
+ private static void printCert(String trustedCertStr, int index) {
  try {
  // Remove the "BEGIN CERTIFICATE" and "END CERTIFICATE" lines and any whitespace
  String cleanedCert = trustedCertStr.replace("-----BEGIN CERTIFICATE-----", "")
@@ -391,6 +393,7 @@ private static void printCert(String trustedCertStr) {
  System.out.println("Signature Algorithm: " + cert.getSigAlgName());
  System.out.println("Version: " + cert.getVersion());
 
+ signatureAlgos[index] = cert.getSigAlgName();
  } catch (Exception e) {
  e.printStackTrace();
  }
@@ -486,19 +489,34 @@ public static void main(String[] args) throws Exception {
  parseArguments(args);
 
  System.out.println("Now printing trustedCertStr==================");
- printCert(trustedCertStr);
+ printCert(trustedCertStr, 0);
  System.out.println("Now printing targetCertStr_A==================");
- printCert(targetCertStr_A);
+ printCert(targetCertStr_A, 1);
  System.out.println("Now printing targetCertStr_B==================");
- printCert(targetCertStr_B);
+ printCert(targetCertStr_B, 2);
  System.out.println("Now printing targetCertStr_C==================");
- printCert(targetCertStr_C);
+ printCert(targetCertStr_C, 3);
  System.out.println("Now printing targetCertStr_D==================");
- printCert(targetCertStr_D);
+ printCert(targetCertStr_D, 4);
  /*
  * Start the tests.
  */
- new SSLSocketSNISensitive();
+ try {
+ new SSLSocketSNISensitive();
+ } catch (Exception e) {
+ if (Utils.isFIPS() && Utils.getFipsProfile().equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS")) {
+ for (int i=0; i<signatureAlgos.length; i++) {
+ if (signatureAlgos[i].contains("MD5") 
+ && e instanceof javax.net.ssl.SSLHandshakeException
+ && "no cipher suites in common".equals(e.getMessage())) {
+ System.out.println("Expected exception msg: <no cipher suites in common> is caught.");
+ return;
+ }
+ }
+ }
+ e.printStackTrace();
+ return;
+ }
  }
 
  Thread clientThread = null;

test/jdk/javax/net/ssl/TLS/CipherTestUtils.java

@@ -316,21 +316,6 @@ private CipherTestUtils() throws Exception {
  TLS_PROTOCOLS.add("TLSv1.2");
  TLS_PROTOCOLS.add("TLSv1.3");
 
- TLS_CIPHERSUITES.put("TLS_AES_128_GCM_SHA256", "TLSv1.3");
- TLS_CIPHERSUITES.put("TLS_AES_256_GCM_SHA384", "TLSv1.3");
- TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_256_CBC_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
-
  factory = (SSLSocketFactory) SSLSocketFactory.getDefault();
  KeyStore serverKeyStore = createServerKeyStore(SERVER_PUBLIC_KEY,
  SERVER_PRIVATE_KEY);

test/jdk/javax/net/ssl/TLS/JSSEClient.java

@@ -30,6 +30,7 @@
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
+import java.util.*;
 
 class JSSEClient extends CipherTestUtils.Client {
 
@@ -42,6 +43,8 @@ class JSSEClient extends CipherTestUtils.Client {
  private final String host;
  private final String protocol;
 
+ private static final Map<String, String> TLS_CIPHERSUITES = new HashMap<>();
+
  JSSEClient(CipherTestUtils cipherTest, String host, int port,
  String protocols, String ciphersuite) throws Exception {
  super(cipherTest, ciphersuite);

test/jdk/javax/net/ssl/TLS/TestJSSE.java

@@ -35,7 +35,6 @@ public class TestJSSE {
 
  private static final String LOCAL_IP = InetAddress.getLoopbackAddress().getHostAddress();
  private static boolean isFIPS = Boolean.parseBoolean(System.getProperty("semeru.fips"));
- private static String customProfile = System.getProperty("semeru.customprofile");
  private static final Map<String, String> TLS_CIPHERSUITES = new HashMap<>();
 
  private static String checkIfProtocolIsUsedInCommonFIPS(String srvProtocol, String clnProtocol) {
@@ -87,7 +86,7 @@ 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.
  String protocolUsedInHandShake = null;
- if (!(isFIPS && customProfile.equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS"))) {
+ if (!(isFIPS)) {
  Security.setProperty("jdk.tls.disabledAlgorithms", "");
  } else {
  TLS_CIPHERSUITES.put("TLS_AES_128_GCM_SHA256", "TLSv1.3");
@@ -96,33 +95,33 @@ public static void main(String... args) throws Exception {
  TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
  TLS_CIPHERSUITES.put("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_256_CBC_SHA256", "TLSv1.2");
- TLS_CIPHERSUITES.put("TLS_DHE_RSA_WITH_AES_128_CBC_SHA256", "TLSv1.2");
  protocolUsedInHandShake = checkIfProtocolIsUsedInCommonFIPS(srvProtocol, clnProtocol);
  }
 
  try (CipherTestUtils.Server srv = server(srvProtocol, cipher, args)) {
  client(srv.getPort(), clnProtocol, cipher, args);
  } catch (Exception e) {
- if (isFIPS && customProfile.equals("OpenJCEPlusFIPS.FIPS140-3-Test-TLS")) {
- System.out.println("1");
- if ((protocolUsedInHandShake == null
+ if (isFIPS) {
+ if (protocolUsedInHandShake == null
  || !TLS_CIPHERSUITES.containsKey(cipher)
- || !TLS_CIPHERSUITES.get(cipher).equals(protocolUsedInHandShake))
- && e instanceof javax.net.ssl.SSLHandshakeException
- && "No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(e.getMessage())) {
- if (args.length >= 1 && args[0].equals("javax.net.ssl.SSLHandshakeException")) {
- System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
- return;
- } else {
- System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
- return;
+ || !TLS_CIPHERSUITES.get(cipher).equals(protocolUsedInHandShake)) {
+ System.out.println("11111111111");
+ if (e instanceof javax.net.ssl.SSLHandshakeException) {
+ System.out.println("2222222222");
+ if ("No appropriate protocol (protocol is disabled or cipher suites are inappropriate)".equals(e.getMessage())) {
+ System.out.println("3333333333");
+ if (args.length >= 1 && args[0].equals("javax.net.ssl.SSLHandshakeException")) {
+ System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
+ return;
+ } else {
+ System.out.println("Expected exception msg: <No appropriate protocol (protocol is disabled or cipher suites are inappropriate)> is caught");
+ return;
+ }
+ }
  }
  }
  }