use TLS

headissue · Jun 29, 2015 · 84c45f9 · 84c45f9
1 parent 00decc4
commit 84c45f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/sahi-core/src/main/java/net/sf/sahi/RemoteRequestProcessor.java b/sahi-core/src/main/java/net/sf/sahi/RemoteRequestProcessor.java
@@ -47,7 +47,7 @@ public class RemoteRequestProcessor {
 
   static {
     try {
-      SSLContext sslContext = SSLContext.getInstance("SSLv3");
+      SSLContext sslContext = SSLContext.getInstance("TLS");
       sslContext.init(SSLHelper.getInstance().getKeyManagerFactoryForRemoteFetch().getKeyManagers(), SSLHelper.getAllTrustingManager(), new java.security.SecureRandom());
       HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
       HostnameVerifier hostnameVerifier = new HostnameVerifier() {

diff --git a/sahi-core/src/main/java/net/sf/sahi/ssl/SSLHelper.java b/sahi-core/src/main/java/net/sf/sahi/ssl/SSLHelper.java
@@ -157,7 +157,7 @@ protected KeyStore getKeyStore() {
   private SSLSocketFactory createSocketFactory(String domain) throws Exception {
     SSLSocketFactory factory;
     KeyManagerFactory keyManagerFactory = getKeyManagerFactory(keystore, KEYSTORE_PASSWORD);
-    SSLContext sslContext = SSLContext.getInstance("SSLv3");
+    SSLContext sslContext = SSLContext.getInstance("TLS");
     KeyManager[] keyManagers = keyManagerFactory.getKeyManagers();
     keyManagers = wrapKeyManagers(keyManagers, domain);
     sslContext.init(keyManagers, getAllTrustingManager(), secureRandom);

diff --git a/sahi-core/src/main/resources/net/sf/sahi/workspace/linux.xml b/sahi-core/src/main/resources/net/sf/sahi/workspace/linux.xml
@@ -24,19 +24,17 @@
     <displayName>PhantomJS</displayName>
     <icon>safari.png</icon>
     <path>phantomjs</path>
-    <options>--proxy=localhost:9999 --ssl-certificates-path=$userDir/certs $userDir/phantomscript/phantom.js</options>
+    <options> --ssl-protocol=tlsv1 --proxy=localhost:9999 --ssl-certificates-path=$userDir/certs $userDir/phantomscript/phantom.js</options>
     <processName>phantomjs</processName>
     <capacity>100</capacity>
     <useSystemProxy>false</useSystemProxy>
   </browserType>
-</browserTypes>
-
-<browserType>
+  <browserType>
     <name>phantomjs-small</name>
     <displayName>PhantomJS small</displayName>
     <icon>safari.png</icon>
     <path>phantomjs</path>
-    <options>--proxy=localhost:9999 --ssl-certificates-path=$userDir/certs $userDir/phantomscript/phantom-small.js</options>
+    <options>--ssl-protocol=tlsv1 --proxy=localhost:9999 --ssl-certificates-path=$userDir/certs $userDir/phantomscript/phantom-small.js</options>
     <processName>phantomjs</processName>
     <capacity>100</capacity>
     <useSystemProxy>false</useSystemProxy>