git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 8b5ec2af1bb56da102c9c80c5d431bef558f1049..35a01d8233bfa0e189f094514298134a73e0d604 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
+++ b/
src/be/nikiroo/utils/serial/server/ConnectActionClientString.java
@@
-22,9
+22,12
@@
public class ConnectActionClientString extends ConnectActionClient {
*
* @param s
* the socket to bind to
*
* @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
);
}
/**
}
/**
@@
-36,8
+39,9
@@
public class ConnectActionClientString extends ConnectActionClient {
* the host to bind to
* @param port
* the port to bind to
* 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
*
* @throws IOException
* in case of I/O error
@@
-47,9
+51,9
@@
public class ConnectActionClientString extends ConnectActionClient {
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
* 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 {
throws IOException {
- super(host, port,
ssl
);
+ super(host, port,
key
);
}
/**
}
/**
@@
-59,8
+63,9
@@
public class ConnectActionClientString extends ConnectActionClient {
* the host to bind to
* @param port
* the port to bind to
* 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
*
* @param version
* the client version
*
@@
-72,9
+77,9
@@
public class ConnectActionClientString extends ConnectActionClient {
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
* 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 {
Version version) throws IOException {
- super(host, port,
ssl
, version);
+ super(host, port,
key
, version);
}
/**
}
/**
@@
-82,11
+87,14
@@
public class ConnectActionClientString extends ConnectActionClient {
*
* @param s
* the socket to bind to
*
* @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
*/
* @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);
}
/**
}
/**