src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java

rev 14275 : 8155039: Simplify code to setup SSLContextImpl and TrustManagerFactoryImpl
Reviewed-by: TBD

*** 35,44 ****
--- 35,45 ----
  
  import javax.net.ssl.*;
  
  import sun.security.provider.certpath.AlgorithmChecker;
  import sun.security.action.GetPropertyAction;
+ import sun.security.action.OpenFileInputStreamAction;
  
  public abstract class SSLContextImpl extends SSLContextSpi {
  
      private static final Debug debug = Debug.getInstance("ssl");
  
*** 836,866 ****
              return tmf.getTrustManagers();
          }
  
          private static KeyManager[] getKeyManagers() throws Exception {
  
!             final Map<String,String> props = new HashMap<>();
!             AccessController.doPrivileged(
!                         new PrivilegedExceptionAction<Object>() {
!                 @Override
!                 public Object run() throws Exception {
!                     props.put("keyStore",  System.getProperty(
!                                 "javax.net.ssl.keyStore", ""));
!                     props.put("keyStoreType", System.getProperty(
!                                 "javax.net.ssl.keyStoreType",
!                                 KeyStore.getDefaultType()));
!                     props.put("keyStoreProvider", System.getProperty(
!                                 "javax.net.ssl.keyStoreProvider", ""));
!                     props.put("keyStorePasswd", System.getProperty(
!                                 "javax.net.ssl.keyStorePassword", ""));
!                     return null;
!                 }
!             });
  
!             final String defaultKeyStore = props.get("keyStore");
!             String defaultKeyStoreType = props.get("keyStoreType");
!             String defaultKeyStoreProvider = props.get("keyStoreProvider");
              if (debug != null && Debug.isOn("defaultctx")) {
                  System.out.println("keyStore is : " + defaultKeyStore);
                  System.out.println("keyStore type is : " +
                                          defaultKeyStoreType);
                  System.out.println("keyStore provider is : " +
--- 837,855 ----
              return tmf.getTrustManagers();
          }
  
          private static KeyManager[] getKeyManagers() throws Exception {
  
!             final Properties props = GetPropertyAction.getProperties();
  
!             final String defaultKeyStore = props.getProperty(
!                                 "javax.net.ssl.keyStore", "");
!             String defaultKeyStoreType = props
!                     .getProperty("javax.net.ssl.keyStoreType",
!                             KeyStore.getDefaultType());
!             String defaultKeyStoreProvider = props
!                     .getProperty("javax.net.ssl.keyStoreProvider", "");
              if (debug != null && Debug.isOn("defaultctx")) {
                  System.out.println("keyStore is : " + defaultKeyStore);
                  System.out.println("keyStore type is : " +
                                          defaultKeyStoreType);
                  System.out.println("keyStore provider is : " +
*** 878,896 ****
              char[] passwd = null;
              try {
                  if (defaultKeyStore.length() != 0 &&
                          !NONE.equals(defaultKeyStore)) {
                      fs = AccessController.doPrivileged(
!                             new PrivilegedExceptionAction<FileInputStream>() {
!                         @Override
!                         public FileInputStream run() throws Exception {
!                             return new FileInputStream(defaultKeyStore);
!                         }
!                     });
                  }
  
!                 String defaultKeyStorePassword = props.get("keyStorePasswd");
                  if (defaultKeyStorePassword.length() != 0) {
                      passwd = defaultKeyStorePassword.toCharArray();
                  }
  
                  /**
--- 867,881 ----
              char[] passwd = null;
              try {
                  if (defaultKeyStore.length() != 0 &&
                          !NONE.equals(defaultKeyStore)) {
                      fs = AccessController.doPrivileged(
!                             new OpenFileInputStreamAction(defaultKeyStore));
                  }
  
!                 String defaultKeyStorePassword = props.getProperty(
!                         "javax.net.ssl.keyStorePassword", "");
                  if (defaultKeyStorePassword.length() != 0) {
                      passwd = defaultKeyStorePassword.toCharArray();
                  }
  
                  /**