jdk-sandbox: comparison test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java

equal deleted inserted replaced

-:356eaea05bf0
+:68fa3d4026ea
 /*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 */
 ENABLED_NON_KRB_NOT_ANON_CIPHERS(
 SSLEngineTestCase.ENABLED_NON_KRB_NOT_ANON_CIPHERS,
 "Enabled by default non kerberos not anonymous"),
 /**
+* Ciphers supported by TLS 1.3 only.
+*/
+TLS13_CIPHERS(
+SSLEngineTestCase.TLS13_CIPHERS,
+"Supported by TLS 1.3 only"),
+/**
 * Ciphers unsupported by the tested SSLEngine.
 */
 UNSUPPORTED_CIPHERS(SSLEngineTestCase.UNSUPPORTED_CIPHERS,
 "Unsupported");
 private static final int DELAY = 1000;
 private static final String HOST = "localhost";
 private static final String SERVER_NAME = "service.localhost";
 private static final String SNI_PATTERN = ".*";
+private static final String[] TLS13_CIPHERS = {
+"TLS_AES_256_GCM_SHA384",
+"TLS_AES_128_GCM_SHA256"
+};
 private static final String[] SUPPORTED_NON_KRB_CIPHERS;
 static {
 try {
 String[] allSupportedCiphers = getContext()
 .createSSLEngine().getSupportedCipherSuites();
 List<String> supportedCiphersList = new LinkedList<>();
 for (String cipher : allSupportedCiphers) {
 if (!cipher.contains("KRB5")
-&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
+&& !isTLS13Cipher(cipher)
+&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
 supportedCiphersList.add(cipher);
 }
 }
 SUPPORTED_NON_KRB_CIPHERS =
 supportedCiphersList.toArray(new String[0]);
 String[] allSupportedCiphers = getContext()
 .createSSLEngine().getSupportedCipherSuites();
 List<String> supportedCiphersList = new LinkedList<>();
 for (String cipher : allSupportedCiphers) {
 if (!cipher.contains("KRB5")
+&& !isTLS13Cipher(cipher)
 && !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")
 && !cipher.endsWith("_SHA256")
 && !cipher.endsWith("_SHA384")) {
 supportedCiphersList.add(cipher);
 }
 String[] allSupportedCiphers = getContext()
 .createSSLEngine().getSupportedCipherSuites();
 List<String> supportedCiphersList = new LinkedList<>();
 for (String cipher : allSupportedCiphers) {
 if (cipher.contains("KRB5")
-&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
+&& !isTLS13Cipher(cipher)
+&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
 supportedCiphersList.add(cipher);
 }
 }
 SUPPORTED_KRB_CIPHERS = supportedCiphersList.toArray(new String[0]);
 } catch (Exception ex) {
 temporary.setUseClientMode(true);
 String[] enabledCiphers = temporary.getEnabledCipherSuites();
 List<String> enabledCiphersList = new LinkedList<>();
 for (String cipher : enabledCiphers) {
 if (!cipher.contains("anon") && !cipher.contains("KRB5")
-&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
+&& !isTLS13Cipher(cipher)
+&& !cipher.contains("TLS_EMPTY_RENEGOTIATION_INFO_SCSV")) {
 enabledCiphersList.add(cipher);
 }
 }
 ENABLED_NON_KRB_NOT_ANON_CIPHERS =
 enabledCiphersList.toArray(new String[0]);
 */
 public SSLEngineTestCase() {
 this.maxPacketSize = 0;
 }
+private static boolean isTLS13Cipher(String cipher) {
+for (String cipherSuite : TLS13_CIPHERS) {
+if (cipherSuite.equals(cipher)) {
+return true;
+}
+}
+return false;
+}
 /**
 * Wraps data with the specified engine.
 *
 * @param engine        - SSLEngine that wraps data.
 * @param wrapper       - Set wrapper id, e.g. "server" of "client".
 SSLEngineResult r = engine.wrap(app, net);
 net.flip();
 int length = net.remaining();
 System.out.println(wrapper + " wrapped " + length + " bytes.");
 System.out.println(wrapper + " handshake status is "
-+ engine.getHandshakeStatus());
++ engine.getHandshakeStatus() + " Result is " + r.getStatus());
 if (maxPacketSize < length && maxPacketSize != 0) {
 throw new AssertionError("Handshake wrapped net buffer length "
 + length + " exceeds maximum packet size "
 + maxPacketSize);
 }
 int length = net.remaining();
 System.out.println(unwrapper + " unwrapping " + length + " bytes...");
 SSLEngineResult r = engine.unwrap(net, app);
 app.flip();
 System.out.println(unwrapper + " handshake status is "
-+ engine.getHandshakeStatus());
++ engine.getHandshakeStatus() + " Result is " + r.getStatus());
 checkResult(r, wantedStatus);
 if (result != null && result.length > 0) {
 result[0] = r;
 }
 return app;
 case "DTLSv1.0":
 case "TLSv1":
 case "TLSv1.1":
 runTests(Ciphers.SUPPORTED_NON_KRB_NON_SHA_CIPHERS);
 break;
-default:
+case "DTLSv1.1":
+case "TLSv1.2":
 runTests(Ciphers.SUPPORTED_NON_KRB_CIPHERS);
+break;
+case "TLSv1.3":
+runTests(Ciphers.TLS13_CIPHERS);
+break;
 }
 break;
 case "krb":
 runTests(Ciphers.SUPPORTED_KRB_CIPHERS);
 break;

changeset 50768	68fa3d4026ea
parent 47216	71c04702a3d5
child 51407	910f7b56592f