test/jdk/java/security/KeyStore/TestKeyStoreBasic.java

rev 59107 : imported patch security

*** 110,120 ****
              .toCharArray();
      private static final String[] KS_Type = {
              "jks", "jceks", "pkcs12", "PKCS11KeyStore"
      };
      private static final String[] PROVIDERS = {
!             "SUN", "SunJCE", "SunJSSE", "SunPKCS11-Solaris"
      };
      private static final String ALIAS_HEAD = "test";
  
      private static final String CRYPTO_ALG = "PBEWithHmacSHA256AndAES_128";
  
--- 110,120 ----
              .toCharArray();
      private static final String[] KS_Type = {
              "jks", "jceks", "pkcs12", "PKCS11KeyStore"
      };
      private static final String[] PROVIDERS = {
!             "SUN", "SunJCE", "SunJSSE"
      };
      private static final String ALIAS_HEAD = "test";
  
      private static final String CRYPTO_ALG = "PBEWithHmacSHA256AndAES_128";
  
*** 127,154 ****
          for (String provider : PROVIDERS) {
              try {
                  runTest(provider);
                  System.out.println("Test with provider " + provider + " passed");
              } catch (java.security.KeyStoreException e) {
-                 if (provider.equals("SunPKCS11-Solaris")) {
-                     System.out.println("KeyStoreException is expected: "
-                             + "PKCS11KeyStore is invalid keystore type: " + e);
-                 } else {
                      throw e;
-                 }
              } catch (NoSuchProviderException e) {
-                 String osName = System.getProperty("os.name");
-                 if (provider.equals("SunPKCS11-Solaris")
-                         && !osName.equals("SunOS")) {
-                     System.out.println("Skip SunPKCS11-Solaris provider on "
-                             + osName);
-                 } else {
                      throw e;
                  }
              }
          }
-     }
  
      public void runTest(String provider) throws Exception {
  
          // load private key
          // all keystore types should support private keys
--- 127,142 ----