Changeset: 117e7917325d for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/117e7917325d
Added Files:
src/main/java/org/monetdb/mcl/net/SecureSocket.java
Removed Files:
src/main/java/org/monetdb/mcl/net/Verify.java
Modified Files:
src/main/java/org/monetdb/mcl/net/MapiSocket.java
src/main/java/org/monetdb/mcl/net/Target.java
Branch: monetdbs
Log Message:
Prepare for implementing TLS
diffs (54 lines):
diff --git a/src/main/java/org/monetdb/mcl/net/MapiSocket.java
b/src/main/java/org/monetdb/mcl/net/MapiSocket.java
--- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java
+++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java
@@ -347,7 +347,7 @@ public final class MapiSocket {
private Socket wrapTLS(Socket sock, Target.Validated validated) throws
MCLException {
if (validated.getTls())
- throw new MCLException("TLS connections (monetdbs://)
are not supported yet");
+ return SecureSocket.wrap(validated, sock);
return sock;
}
diff --git a/src/main/java/org/monetdb/mcl/net/SecureSocket.java
b/src/main/java/org/monetdb/mcl/net/SecureSocket.java
new file mode 100644
--- /dev/null
+++ b/src/main/java/org/monetdb/mcl/net/SecureSocket.java
@@ -0,0 +1,9 @@
+package org.monetdb.mcl.net;
+
+import java.net.Socket;
+
+public class SecureSocket {
+ public static Socket wrap(Target.Validated validated, Socket sock) {
+ throw new MCLException("TLS connections (monetdbs://) are not
supported yet");
+ }
+}
diff --git a/src/main/java/org/monetdb/mcl/net/Target.java
b/src/main/java/org/monetdb/mcl/net/Target.java
--- a/src/main/java/org/monetdb/mcl/net/Target.java
+++ b/src/main/java/org/monetdb/mcl/net/Target.java
@@ -660,4 +660,11 @@ public class Target {
return clientcert.isEmpty() ? clientkey : clientcert;
}
}
+
+ public enum Verify {
+ None,
+ Cert,
+ Hash,
+ System;
+ }
}
diff --git a/src/main/java/org/monetdb/mcl/net/Verify.java
b/src/main/java/org/monetdb/mcl/net/Verify.java
deleted file mode 100644
--- a/src/main/java/org/monetdb/mcl/net/Verify.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.monetdb.mcl.net;
-
-public enum Verify {
- None,
- Cert,
- Hash,
- System;
-}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
