summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/config.example (renamed from src/main/java/org/openslx/network/config.example)2
-rw-r--r--src/main/java/org/openslx/filetransfer/ClassTest.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/network/config.example b/extras/config.example
index 522dfdd..a2c27cd 100644
--- a/src/main/java/org/openslx/network/config.example
+++ b/extras/config.example
@@ -1,3 +1,5 @@
+# This file is expected to be called "/opt/openslx/proxy/config"
+#
# proxy configuration:
# 3 options for proxy configuration: AUTO = autmatically, YES, NO. If nothing is
# set, the default automatically will be choosen.
diff --git a/src/main/java/org/openslx/filetransfer/ClassTest.java b/src/main/java/org/openslx/filetransfer/ClassTest.java
index 1fecbcc..92269bb 100644
--- a/src/main/java/org/openslx/filetransfer/ClassTest.java
+++ b/src/main/java/org/openslx/filetransfer/ClassTest.java
@@ -60,7 +60,7 @@ public class ClassTest
keystore.load( new FileInputStream( pathToKeyStore ), passphrase );
KeyManagerFactory kmf = KeyManagerFactory.getInstance( KeyManagerFactory.getDefaultAlgorithm() );
kmf.init( keystore, passphrase );
- SSLContext context = SSLContext.getInstance( "SSLv3" );
+ SSLContext context = SSLContext.getInstance( "TLSv1.2" );
KeyManager[] keyManagers = kmf.getKeyManagers();
context.init( keyManagers, null, null );
@@ -73,7 +73,7 @@ public class ClassTest
TrustManagerFactory tmf = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm() );
tmf.init( keystore );
- context = SSLContext.getInstance( "SSLv3" );
+ context = SSLContext.getInstance( "TLSv1.2" );
TrustManager[] trustManagers = tmf.getTrustManagers();
context.init( null, trustManagers, null );
@@ -114,7 +114,7 @@ public class ClassTest
keystore.load(new FileInputStream(pathToKeyStore), passphrase);
KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(keystore, passphrase);
- SSLContext context = SSLContext.getInstance("SSLv3");
+ SSLContext context = SSLContext.getInstance("TLSv1.2");
KeyManager[] keyManagers = kmf.getKeyManagers();
context.init(keyManagers, null, null);