test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java

rev 59383 : [mq]: final

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 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) 2005, 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.
*** 154,172 ****
                              result.getServerCipherKey(), cipherAlgorithm);
                          match(lineNumber, clientIv, result.getClientIv(), "");
                          match(lineNumber, serverIv, result.getServerIv(), "");
                          match(lineNumber, clientMacBytes, result.getClientMacKey(), "");
                          match(lineNumber, serverMacBytes, result.getServerMacKey(), "");
-                     } catch (InvalidAlgorithmParameterException iape) {
-                         // SSLv3 support is removed in S12
-                         if (provider.getName().indexOf("Solaris") != -1) {
-                             if (major == 3 && minor == 0) {
-                                 System.out.println("Skip testing SSLv3 on Solaris");
-                                 continue;
-                             }
-                         }
-                         throw iape;
                      } catch (ProviderException pe) {
                          if (provider.getName().indexOf("NSS") != -1) {
                              Throwable t = pe.getCause();
                              if (expandedKeyLength != 0
                                      && t.getMessage().indexOf(
--- 154,163 ----