Merge pull request #230 from Microsoft/users/arukhlin/client_cert

Fix the key store password issue
microsoft · Aug 30, 2017 · 6ddd063 · 6ddd063
2 parents 844fb06 + 6345b5c
commit 6ddd063
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...rc/com/microsoft/tfs/core/config/httpclient/internal/DefaultSSLProtocolSocketFactory.java b/...rc/com/microsoft/tfs/core/config/httpclient/internal/DefaultSSLProtocolSocketFactory.java
@@ -271,7 +271,8 @@ private KeyManager[] getDefaultKeyManagers() throws KeyStoreException, NoSuchAlg
 
         if (!StringUtil.isNullOrEmpty(keyStorePath)) {
             final String keyStoreType = System.getProperty("javax.net.ssl.keyStoreType", "JKS"); //$NON-NLS-1$ //$NON-NLS-2$
-            final String keyStorePassword = System.getProperty("javax.net.ssl.keyStorePassword", StringUtil.EMPTY); //$NON-NLS-1$
+            final char[] keyStorePassword =
+                System.getProperty("javax.net.ssl.keyStorePassword", StringUtil.EMPTY).toCharArray(); //$NON-NLS-1$
 
             final KeyManagerFactory keyManagerFactory =
                 KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
@@ -280,8 +281,8 @@ private KeyManager[] getDefaultKeyManagers() throws KeyStoreException, NoSuchAlg
             try {
                 final InputStream keyStoreFile = new FileInputStream(keyStorePath);
 
-                keyStore.load(keyStoreFile, keyStorePassword.toCharArray());
-                keyManagerFactory.init(keyStore, null);
+                keyStore.load(keyStoreFile, keyStorePassword);
+                keyManagerFactory.init(keyStore, keyStorePassword);
 
                 KeyManager[] managers = keyManagerFactory.getKeyManagers();