Menu
▾
▴
[HtmlUnit] SVN: [8675] trunk/htmlunit/src
|
From: <asa...@us...> - 2013-10-23 10:13:25
|
Revision: 8675
http://sourceforge.net/p/htmlunit/code/8675
Author: asashour
Date: 2013-10-23 10:13:22 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
SSL: use default algorithm for fetching the KeyManagerFactory.
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitSSLSocketFactory.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2013-10-22 20:52:50 UTC (rev 8674)
+++ trunk/htmlunit/src/changes/changes.xml 2013-10-23 10:13:22 UTC (rev 8675)
@@ -8,6 +8,9 @@
<body>
<release version="2.14" date="???" description="Bugfixes">
+ <action type="fix" dev="asashour">
+ SSL: use default algorithm for fetching the KeyManagerFactory.
+ </action>
<action type="remove" dev="asashour">
BrowserVersion: remove deprecated FIREFOX_3_6, FIREFOX_10, CHROME_16, INTERNET_EXPLORER_6
and INTERNET_EXPLORER_7.
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitSSLSocketFactory.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitSSLSocketFactory.java 2013-10-22 20:52:50 UTC (rev 8674)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HtmlUnitSSLSocketFactory.java 2013-10-23 10:13:22 UTC (rev 8675)
@@ -173,7 +173,8 @@
final char[] passwordChars = password != null ? password.toCharArray() : null;
final KeyStore keyStore = getKeyStore(options);
- final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("SunX509");
+ final String algorithm = KeyManagerFactory.getDefaultAlgorithm();
+ final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
keyManagerFactory.init(keyStore, passwordChars);
return keyManagerFactory.getKeyManagers();
}
|
