You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/01/22 14:38:56 UTC

[1/2] git commit: [WAGON-383] Regression for SSLv3

[WAGON-383] Regression for SSLv3


Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/d95189d0
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/d95189d0
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/d95189d0

Branch: refs/heads/master
Commit: d95189d00ab1e7ac79bd5b9f7d20525c2776a6a2
Parents: d31b514
Author: olivier lamy <ol...@apache.org>
Authored: Tue Jan 22 14:30:25 2013 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Jan 22 14:30:25 2013 +0100

----------------------------------------------------------------------
 pom.xml                                            |    2 +-
 .../shared/http4/AbstractHttpClientWagon.java      |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d95189d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ffdab0..996bf8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>22</version>
+    <version>23</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/d95189d0/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
index 18f0d9f..b728c00 100644
--- a/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http4/AbstractHttpClientWagon.java
@@ -295,10 +295,11 @@ public abstract class AbstractHttpClientWagon
             {
                 try
                 {
-                    SSLSocketFactory sslSocketFactory =
-                        new SSLSocketFactory( EasyX509TrustManager.createEasySSLContext(), sslAllowAll
+                    ConfigurableSSLSocketFactory sslSocketFactory =
+                        new ConfigurableSSLSocketFactory( EasyX509TrustManager.createEasySSLContext(), sslAllowAll
                             ? new EasyHostNameVerifier()
                             : new BrowserCompatHostnameVerifier() );
+
                     Scheme httpsScheme = new Scheme( "https", 443, sslSocketFactory );
 
                     threadSafeClientConnManager.getSchemeRegistry().register( httpsScheme );