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
/
ConnectActionServerObject.java
diff --git
a/src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java
b/src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java
index e0e4276059d7044e9c01d0e3b6b127d3e575ca95..79fa38ce616ec4535067dcc9830b4f4ea2ea01ca 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java
+++ b/
src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java
@@
-21,9
+21,12
@@
public class ConnectActionServerObject extends ConnectActionServer {
*
* @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 ConnectActionServerObject(Socket s) {
- super(s);
+ public ConnectActionServerObject(Socket s
, String key
) {
+ super(s
, key
);
}
/**
}
/**
@@
-31,11
+34,14
@@
public class ConnectActionServerObject extends ConnectActionServer {
*
* @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 server version
*/
* @param version
* the server version
*/
- public ConnectActionServerObject(Socket s, Version version) {
- super(s, version);
+ public ConnectActionServerObject(Socket s,
String key,
Version version) {
+ super(s,
key,
version);
}
/**
}
/**