Mercurial > hg > monetdb-java

changeset 799:117e7917325d monetdbs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prepare for implementing TLS
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Thu, 07 Dec 2023 10:53:50 +0100 (16 months ago)
parents 895429110b7b
children 09f463444dde
files src/main/java/org/monetdb/mcl/net/MapiSocket.java src/main/java/org/monetdb/mcl/net/SecureSocket.java src/main/java/org/monetdb/mcl/net/Target.java src/main/java/org/monetdb/mcl/net/Verify.java
diffstat 4 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}
 
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");
+    }
+}
--- 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;
+    }
 }
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;
-}