test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2011, 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) 2001, 2015, 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.
*** 32,42 ****
   *     system properties in samevm/agentvm mode.
   * @author Jaya Hangal
   */
  
  import java.io.*;
! import java.net.*;
  import javax.net.ssl.*;
  
  public class CipherSuiteOrder {
  
      /*
--- 32,42 ----
   *     system properties in samevm/agentvm mode.
   * @author Jaya Hangal
   */
  
  import java.io.*;
! import java.security.Security;
  import javax.net.ssl.*;
  
  public class CipherSuiteOrder {
  
      /*
*** 194,203 ****
--- 194,207 ----
  
      volatile Exception serverException = null;
      volatile Exception clientException = null;
  
      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.
+         Security.setProperty("jdk.tls.disabledAlgorithms", "");
+ 
          String keyFilename =
              System.getProperty("test.src", "./") + "/" + pathToStores +
                  "/" + keyStoreFile;
          String trustFilename =
              System.getProperty("test.src", "./") + "/" + pathToStores +