From a1e528becf0cf203f9f449541666c065608dd6a6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 21 Nov 2014 12:32:55 +0100
Subject: Switch to TLSv1.2, move proxy config example file

---
 extras/config.example                                 | 16 ++++++++++++++++
 src/main/java/org/openslx/filetransfer/ClassTest.java |  6 +++---
 src/main/java/org/openslx/network/config.example      | 14 --------------
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 extras/config.example
 delete mode 100644 src/main/java/org/openslx/network/config.example

diff --git a/extras/config.example b/extras/config.example
new file mode 100644
index 0000000..a2c27cd
--- /dev/null
+++ b/extras/config.example
@@ -0,0 +1,16 @@
+# 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.
+PROXY_CONF=AUTO
+# If PROXY_CONF = YES some more information for connection are necessary:
+# PROXY_ADDR = destination addres
+PROXY_ADDR=1.2.3.4
+
+# PROXY_PORT = port for proxy connection
+PROXY_PORT=1080
+
+# Username and password are optional, if empty, it is assumed that not necessary:
+PROXY_USERNAME=test
+PROXY_PASSWORD=password
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);
diff --git a/src/main/java/org/openslx/network/config.example b/src/main/java/org/openslx/network/config.example
deleted file mode 100644
index 522dfdd..0000000
--- a/src/main/java/org/openslx/network/config.example
+++ /dev/null
@@ -1,14 +0,0 @@
-# proxy configuration:
-# 3 options for proxy configuration: AUTO = autmatically, YES, NO. If nothing is
-# set, the default automatically will be choosen.
-PROXY_CONF=AUTO
-# If PROXY_CONF = YES some more information for connection are necessary:
-# PROXY_ADDR = destination addres
-PROXY_ADDR=1.2.3.4
-
-# PROXY_PORT = port for proxy connection
-PROXY_PORT=1080
-
-# Username and password are optional, if empty, it is assumed that not necessary:
-PROXY_USERNAME=test
-PROXY_PASSWORD=password
-- 
cgit v1.2.3-55-g7522