5 files changed, 23 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index aac2ccd..154d434 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,17 @@
+KEYPASS=123456
 all:
 	javac shared/Main.java
 run:
 	java shared/Main
+sslclientrun:
+	java -Djavax.net.ssl.keyStore=/home/buetow/svn/netcalendar/trunk/mySrvKeystore \
+		-Djavax.net.ssl.keyStorePassword=$(KEYPASS) \
+		shared/Main --client-only --server-address=localhost
+
+sslserverrun:
+	java -Djavax.net.ssl.keyStore=/home/buetow/svn/netcalendar/trunk/mySrvKeystore \
+		-Djavax.net.ssl.keyStorePassword=$(KEYPASS) \
+		shared/Main --server-only
 test: all run
 t: test
 err:
@@ -36,3 +46,6 @@ header:
 	@header=`sed 's/\(.*\)/ echo " \*: \1"/' $(HEADER)`; \
 		echo '/*:*' > $(FILE); eval "$$header" >> $(FILE); \
 		echo ' *:*/' >> $(FILE); cat .tmp >> $(FILE); rm -f .tmp
+sslkeygen:
+	keytool -genkey -keystore mySrvKeystore -keyalg RSA
+	
diff --git a/client/ServerRequester.java b/client/ServerRequester.java
index f06c923..588d528 100644
--- a/client/ServerRequester.java
+++ b/client/ServerRequester.java
@@ -6,6 +6,7 @@ package client;
 
 import java.io.*;
 import java.net.*;
+import java.security.*;
 import javax.net.*;
 import javax.net.ssl.*;
 
@@ -24,9 +25,13 @@ public class ServerRequester  {
 	 * @throws IOException
 	 */
 	private static Socket makeClientSocket() throws IOException {
-		if (!Config.getBooleanValue("use_ssl")) 
+		if (!Config.getBooleanValue("use_ssl")) {
+			Main.statusMessage("Making non-SSL Socket...");
 			return new Socket(Config.getServerAddress(), Config.getIntValue("server_port"));
-		
+		}
+
+		Main.statusMessage("Making SSL Socket...");
+		//Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
 		SocketFactory socketFactory = SSLSocketFactory.getDefault();
 		return socketFactory.createSocket(Config.getServerAddress(), Config.getIntValue("server_port"));
 	}
diff --git a/config.txt b/config.txt
index dbc3e3d..f0c814f 100644
--- a/config.txt
+++ b/config.txt
@@ -6,7 +6,7 @@ regexp_case_insensitive=true;
 server_address=localhost;
 server_database_dir=calendardb;
 server_port=4321;
-server_run=true;
+server_run=false;
 server_startup_command=none;
 server_updatedb_command=none;
-use_ssl=false;
+use_ssl=true;
diff --git a/mySrvKeystore b/mySrvKeystore
new file mode 100644
index 0000000..ce5fee4
--- /dev/null
+++ b/mySrvKeystore
diff --git a/shared/Config.java b/shared/Config.java
index a256eff..2a9daf5 100644
--- a/shared/Config.java
+++ b/shared/Config.java
@@ -23,7 +23,7 @@ public final class Config {
 		if (args.length > 0) {
 			if (args[0].equals("--help")) {
 				System.out.println(Config.VERSION + " help");
-				System.out.println("Copyright (C) 2006  Paul Buetow [paul at buetow dot org]");
+				System.out.println("(c) 2006, 2009 by Dipl.-Inform. (FH) Paul C. Buetow [netcalendar@dev.buetow.org]");
 				System.out.println("This is free software, see the LICENSE.txt for copying conditions. There is NO");
 				System.out.println("warranty; not even for MERCHANTABILITY of FITNESS FOR A PARTICULAR PURPOSE.");
 				System.out.println();