serial: switch from SSL to CryptUtils

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / server / ConnectActionClientString.java

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
index f9402cbeb9a0d5a14cf4e6083c3bdefb2f725248..35a01d8233bfa0e189f094514298134a73e0d604 100644 (file)
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 import be.nikiroo.utils.Version;
 
@@ -21,9 +22,12 @@ public class ConnectActionClientString extends ConnectActionClient {
         * 
         * @param s
         *            the socket to bind to
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         */
-       public ConnectActionClientString(Socket s) {
-               super(s);
+       public ConnectActionClientString(Socket s, String key) {
+               super(s, key);
        }
 
        /**
@@ -35,15 +39,21 @@ public class ConnectActionClientString extends ConnectActionClient {
         *            the host to bind to
         * @param port
         *            the port to bind to
-        * @param ssl
-        *            TRUE for an SSL connection, FALSE for plain text
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         * 
         * @throws IOException
-        *             in case of I/O error when creating the socket
+        *             in case of I/O error
+        * @throws UnknownHostException
+        *             if the IP address of the host could not be determined
+        * @throws IllegalArgumentException
+        *             if the port parameter is outside the specified range of valid
+        *             port values, which is between 0 and 65535, inclusive
         */
-       public ConnectActionClientString(String host, int port, boolean ssl)
+       public ConnectActionClientString(String host, int port, String key)
                        throws IOException {
-               super(host, port, ssl);
+               super(host, port, key);
        }
 
        /**
@@ -53,17 +63,23 @@ public class ConnectActionClientString extends ConnectActionClient {
         *            the host to bind to
         * @param port
         *            the port to bind to
-        * @param ssl
-        *            TRUE for an SSL connection, FALSE for plain text
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         * @param version
         *            the client version
         * 
         * @throws IOException
-        *             in case of I/O error when creating the socket
+        *             in case of I/O error
+        * @throws UnknownHostException
+        *             if the IP address of the host could not be determined
+        * @throws IllegalArgumentException
+        *             if the port parameter is outside the specified range of valid
+        *             port values, which is between 0 and 65535, inclusive
         */
-       public ConnectActionClientString(String host, int port, boolean ssl,
+       public ConnectActionClientString(String host, int port, String key,
                        Version version) throws IOException {
-               super(host, port, ssl, version);
+               super(host, port, key, version);
        }
 
        /**
@@ -71,11 +87,14 @@ public class ConnectActionClientString extends ConnectActionClient {
         * 
         * @param s
         *            the socket to bind to
+        * @param key
+        *            an optional key to encrypt all the communications (if NULL,
+        *            everything will be sent in clear text)
         * @param version
         *            the client version
         */
-       public ConnectActionClientString(Socket s, Version version) {
-               super(s, version);
+       public ConnectActionClientString(Socket s, String key, Version version) {
+               super(s, key, version);
        }
 
        /**