test/javax/net/ssl/sanity/ciphersuites/TLSCipherSuitesOrder.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.
   *      Parameter order: <protocol> <client cipher order> <server cipher order>
   * @run main/othervm TLSCipherSuitesOrder TLSv13 ORDERED default
   * @run main/othervm TLSCipherSuitesOrder TLSv13 UNORDERED default
   * @run main/othervm TLSCipherSuitesOrder TLSv13 UNORDERED UNORDERED
*** 65,74 ****
--- 66,79 ----
          }
      }
  
      private TLSCipherSuitesOrder(String protocol, String[] clientcipherSuites,
              String[] servercipherSuites) {
+         // Re-enable protocol if it is disabled.
+         if (protocol.equals("TLSv1") || protocol.equals("TLSv1.1")) {
+             SecurityUtils.removeFromDisabledTlsAlgs(protocol);
+         }
          this.protocol = protocol;
          this.clientcipherSuites = clientcipherSuites;
          this.servercipherSuites = servercipherSuites;
      }