test/javax/net/ssl/sanity/ciphersuites/SystemPropCipherSuitesOrder.java

rev 14346 : 8202343: Disable TLS 1.0 and 1.1
Reviewed-by: xuelei, dfuchs, coffeys, sgehwolf

*** 1,7 ****
  /*
!  * Copyright (c) 2019, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2019, 2020, 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.
*** 27,36 ****
--- 27,37 ----
  /*
   * @test
   * @bug 8234728
   * @library /javax/net/ssl/templates
   *          /javax/net/ssl/TLSCommon
+  *          /lib/security
   * @summary Test TLS ciphersuites order set through System properties
   * @run main/othervm
   *      -Djdk.tls.client.cipherSuites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384
   *      -Djdk.tls.server.cipherSuites=TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256
   *      -Djdk.tls.client.protocols="TLSv1.3,TLSv1.2,TLSv1.1,TLSv1,SSLv3"
*** 96,105 ****
--- 97,110 ----
          }
      }
  
      private SystemPropCipherSuitesOrder(String protocol) {
          this.protocol = protocol;
+         // Re-enable protocol if disabled.
+         if (protocol.equals("TLSv1") || protocol.equals("TLSv1.1")) {
+             SecurityUtils.removeFromDisabledTlsAlgs(protocol);
+         }
      }
  
      // Servers are configured before clients, increment test case after.
      @Override
      protected void configureClientSocket(SSLSocket socket) {