summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2014-11-12 15:06:19 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2014-11-12 15:07:18 +0100
commit0bb212019a0c5e0d37e2884f103ea63b7c9ea426 (patch)
tree9f892451117d510bb660a1352fedd548f8d5e030
parent0fc8b05a71054311c6290f6408386f7c48409724 (diff)
parent3521712032aca2dccf6f6ee4a77b3746bf17f276 (diff)
downloadjgit-0bb212019a0c5e0d37e2884f103ea63b7c9ea426.tar.gz
jgit-0bb212019a0c5e0d37e2884f103ea63b7c9ea426.zip
Merge branch 'stable-3.5'
* stable-3.5: Prepare 3.5.3-SNAPSHOT builds JGit v3.5.2.201411120430-r Don't use SSL anymore to avoid POODLE attack Change-Id: Icc8404a94512aae36da83baafb8b10422b7bbf7b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/http/JDKHttpConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/JDKHttpConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/JDKHttpConnection.java
index bde5e1da26..ed37feab3f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/JDKHttpConnection.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/JDKHttpConnection.java
@@ -186,7 +186,7 @@ public class JDKHttpConnection implements HttpConnection {
public void configure(KeyManager[] km, TrustManager[] tm,
SecureRandom random) throws NoSuchAlgorithmException,
KeyManagementException {
- SSLContext ctx = SSLContext.getInstance("SSL"); //$NON-NLS-1$
+ SSLContext ctx = SSLContext.getInstance("TLS"); //$NON-NLS-1$
ctx.init(km, tm, random);
((HttpsURLConnection) wrappedUrlConnection).setSSLSocketFactory(ctx
.getSocketFactory());