OpenSSL engine options should also be removed

eclipse-vertx · Nov 17, 2023 · 8787b9f · 8787b9f
1 parent de864a8
commit 8787b9f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/main/asciidoc/net.adoc b/src/main/asciidoc/net.adoc
@@ -811,7 +811,7 @@ Java TLS supports ALPN (Java 8 with the most recent versions).
 
 OpenSSL also supports (native) ALPN.
 
-OpenSSL requires to configure {@link io.vertx.core.net.TCPSSLOptions#setOpenSslEngineOptions(OpenSSLEngineOptions)}
+OpenSSL requires to configure {@link io.vertx.core.net.TCPSSLOptions#setSslEngineOptions(SSLEngineOptions)}
 and use http://netty.io/wiki/forked-tomcat-native.html[netty-tcnative] jar on the classpath. Using tcnative may require
 OpenSSL to be installed on your OS depending on the tcnative implementation.
 

diff --git a/src/main/generated/io/vertx/core/net/TCPSSLOptionsConverter.java b/src/main/generated/io/vertx/core/net/TCPSSLOptionsConverter.java
@@ -90,9 +90,6 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, TCPSSLO
           }
           break;
         case "openSslEngineOptions":
-          if (member.getValue() instanceof JsonObject) {
-            obj.setOpenSslEngineOptions(new io.vertx.core.net.OpenSSLEngineOptions((io.vertx.core.json.JsonObject)member.getValue()));
-          }
           break;
         case "enabledSecureTransportProtocols":
           if (member.getValue() instanceof JsonArray) {

diff --git a/src/main/java/examples/NetExamples.java b/src/main/java/examples/NetExamples.java
@@ -580,7 +580,7 @@ public void exampleSSLEngine(Vertx vertx, JksOptions keyStoreOptions) {
     options = new NetServerOptions().
       setSsl(true).
       setKeyCertOptions(keyStoreOptions).
-      setOpenSslEngineOptions(new OpenSSLEngineOptions());
+      setSslEngineOptions(new OpenSSLEngineOptions());
   }
 
   public void example46(Vertx vertx, JksOptions keyStoreOptions) {

diff --git a/src/test/java/io/vertx/core/http/HttpTLSTest.java b/src/test/java/io/vertx/core/http/HttpTLSTest.java
@@ -1175,7 +1175,7 @@ TLSTest run(boolean shouldPass) {
         options.addCrlPath("tls/root-ca/crl.pem");
       }
       if (clientOpenSSL) {
-        options.setOpenSslEngineOptions(new OpenSSLEngineOptions());
+        options.setSslEngineOptions(new OpenSSLEngineOptions());
       } else {
         options.setSslEngineOptions(new JdkSSLEngineOptions());
       }
@@ -1217,7 +1217,7 @@ TLSTest run(boolean shouldPass) {
         serverOptions.addCrlPath("tls/root-ca/crl.pem");
       }
       if (serverOpenSSL) {
-        serverOptions.setOpenSslEngineOptions(new OpenSSLEngineOptions());
+        serverOptions.setSslEngineOptions(new OpenSSLEngineOptions());
       }
       if (serverUsesAlpn == Boolean.TRUE) {
         serverOptions.setUseAlpn(serverUsesAlpn);