This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new fdc4c79  Fix OpenSSL version with the actual library version
fdc4c79 is described below

commit fdc4c79b4747b3560f4f16268fbe021296e5e929
Author: remm <r...@apache.org>
AuthorDate: Thu Nov 18 12:49:34 2021 +0100

    Fix OpenSSL version with the actual library version
    
    Previously this was hardcoded by jextract based on the header files.
    Also expose the OpenSSL version number (for likely use eventually).
    Stop using constant "String"s generated by jextract since the code is so
    inefficient (not important very here, but it also makes scope tracking
    harder: one string means one implicit scope that will stay forever).
---
 modules/openssl-java17/openssl-tomcat.conf         |  14 +-
 .../util/net/openssl/panama/OpenSSLContext.java    |  10 +-
 .../openssl/panama/OpenSSLLifecycleListener.java   |   3 +-
 .../util/openssl/SSL_set_info_callback$cb.java     |   2 +-
 .../apache/tomcat/util/openssl/constants$0.java    |  30 ++-
 .../apache/tomcat/util/openssl/constants$1.java    |  36 ++-
 .../apache/tomcat/util/openssl/constants$10.java   |  41 ++--
 .../apache/tomcat/util/openssl/constants$11.java   |  35 +--
 .../apache/tomcat/util/openssl/constants$12.java   |  32 +--
 .../apache/tomcat/util/openssl/constants$13.java   |  35 ++-
 .../apache/tomcat/util/openssl/constants$14.java   |  35 +--
 .../apache/tomcat/util/openssl/constants$15.java   |  34 ++-
 .../apache/tomcat/util/openssl/constants$16.java   |  36 +--
 .../apache/tomcat/util/openssl/constants$17.java   |  34 +--
 .../apache/tomcat/util/openssl/constants$18.java   |  33 ++-
 .../apache/tomcat/util/openssl/constants$19.java   |  33 +--
 .../apache/tomcat/util/openssl/constants$2.java    |  35 +--
 .../apache/tomcat/util/openssl/constants$20.java   |  29 ++-
 .../apache/tomcat/util/openssl/constants$21.java   |  33 +--
 .../apache/tomcat/util/openssl/constants$22.java   |  34 ++-
 .../apache/tomcat/util/openssl/constants$23.java   |  38 +--
 .../apache/tomcat/util/openssl/constants$24.java   |  37 +--
 .../apache/tomcat/util/openssl/constants$25.java   |  38 ++-
 .../apache/tomcat/util/openssl/constants$26.java   |  39 +--
 .../apache/tomcat/util/openssl/constants$27.java   |  33 +--
 .../apache/tomcat/util/openssl/constants$28.java   |  19 +-
 .../apache/tomcat/util/openssl/constants$29.java   |  36 ---
 .../apache/tomcat/util/openssl/constants$3.java    |  31 ++-
 .../apache/tomcat/util/openssl/constants$4.java    |  32 +--
 .../apache/tomcat/util/openssl/constants$5.java    |  30 +--
 .../apache/tomcat/util/openssl/constants$6.java    |  26 +-
 .../apache/tomcat/util/openssl/constants$7.java    |  28 +--
 .../apache/tomcat/util/openssl/constants$8.java    |  35 ++-
 .../apache/tomcat/util/openssl/constants$9.java    |  41 ++--
 .../org/apache/tomcat/util/openssl/openssl_h.java  | 269 ++++++++++-----------
 35 files changed, 635 insertions(+), 671 deletions(-)

diff --git a/modules/openssl-java17/openssl-tomcat.conf 
b/modules/openssl-java17/openssl-tomcat.conf
index 8775c52..9256996 100644
--- a/modules/openssl-java17/openssl-tomcat.conf
+++ b/modules/openssl-java17/openssl-tomcat.conf
@@ -61,6 +61,8 @@
 --include-function CRYPTO_free                         # header: 
/usr/include/openssl/crypto.h
 --include-function FIPS_mode                           # header: 
/usr/include/openssl/crypto.h
 --include-function FIPS_mode_set                       # header: 
/usr/include/openssl/crypto.h
+--include-function OpenSSL_version                     # header: 
/usr/include/openssl/crypto.h
+--include-function OpenSSL_version_num                 # header: 
/usr/include/openssl/crypto.h
 --include-macro OPENSSL_INIT_ENGINE_ALL_BUILTIN        # header: 
/usr/include/openssl/crypto.h
 
 #### Extracted from: /usr/include/openssl/dh.h
@@ -133,13 +135,6 @@
 --include-macro OPENSSL_LINE          # header: 
/usr/include/openssl/opensslconf-x86_64.h
 --include-macro OPENSSL_MIN_API       # header: 
/usr/include/openssl/opensslconf-x86_64.h
 
-#### Extracted from: /usr/include/openssl/opensslv.h
-
---include-macro OPENSSL_VERSION_NUMBER    # header: 
/usr/include/openssl/opensslv.h
---include-macro OPENSSL_VERSION_TEXT      # header: 
/usr/include/openssl/opensslv.h
---include-macro SHLIB_VERSION_HISTORY     # header: 
/usr/include/openssl/opensslv.h
---include-macro SHLIB_VERSION_NUMBER      # header: 
/usr/include/openssl/opensslv.h
-
 #### Extracted from: /usr/include/openssl/pem.h
 
 --include-function PEM_read_bio_DHparams                # header: 
/usr/include/openssl/pem.h
@@ -287,11 +282,6 @@
 --include-macro SSL_SENT_SHUTDOWN                                # header: 
/usr/include/openssl/ssl.h
 --include-macro SSL_SESS_CACHE_OFF                               # header: 
/usr/include/openssl/ssl.h
 --include-macro SSL_SESS_CACHE_SERVER                            # header: 
/usr/include/openssl/ssl.h
---include-macro SSL_TXT_DH                                       # header: 
/usr/include/openssl/ssl.h
---include-macro SSL_TXT_DSS                                      # header: 
/usr/include/openssl/ssl.h
---include-macro SSL_TXT_ECDH                                     # header: 
/usr/include/openssl/ssl.h
---include-macro SSL_TXT_ECDSA                                    # header: 
/usr/include/openssl/ssl.h
---include-macro SSL_TXT_RSA                                      # header: 
/usr/include/openssl/ssl.h
 --include-macro SSL_VERIFY_FAIL_IF_NO_PEER_CERT                  # header: 
/usr/include/openssl/ssl.h
 --include-macro SSL_VERIFY_NONE                                  # header: 
/usr/include/openssl/ssl.h
 --include-macro SSL_VERIFY_PEER                                  # header: 
/usr/include/openssl/ssl.h
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 14957c9..c5def28 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -947,12 +947,12 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
     //private static final int SSL_aGOST01 = 200;
     //private static final int SSL_aSRP = 400;
 
-    private static final String SSL_TXT_RSA = 
CLinker.toJavaString(SSL_TXT_RSA());
-    private static final String SSL_TXT_DH = 
CLinker.toJavaString(SSL_TXT_DH());
-    private static final String SSL_TXT_DSS = 
CLinker.toJavaString(SSL_TXT_DSS());
+    private static final String SSL_TXT_RSA = "RSA";
+    private static final String SSL_TXT_DH = "DH";
+    private static final String SSL_TXT_DSS = "DSS";
     private static final String SSL_TXT_KRB5 = "KRB5";
-    private static final String SSL_TXT_ECDH = 
CLinker.toJavaString(SSL_TXT_ECDH());
-    private static final String SSL_TXT_ECDSA = 
CLinker.toJavaString(SSL_TXT_ECDSA());
+    private static final String SSL_TXT_ECDH = "ECDH";
+    private static final String SSL_TXT_ECDSA = "ECDSA";
 
     private static String getCipherAuthenticationMethod(int auth, int kx) {
         switch (kx) {
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLifecycleListener.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLifecycleListener.java
index fa6336b..a4541f1 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLifecycleListener.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLifecycleListener.java
@@ -265,8 +265,7 @@ public class OpenSSLLifecycleListener implements 
LifecycleListener {
             }
         }
 
-        // FIXME: OPENSSL_VERSION_TEXT is actually hardcoded by jextract so 
this is not useful
-        log.info(sm.getString("listener.initializedOpenSSL", new 
String(OPENSSL_VERSION_TEXT().toByteArray())));
+        log.info(sm.getString("listener.initializedOpenSSL", 
CLinker.toJavaString(OpenSSL_version(0))));
         OpenSSLStatus.setAvailable(true);
     }
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
index e6b9e71..de40724 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/SSL_set_info_callback$cb.java
@@ -36,7 +36,7 @@ public interface SSL_set_info_callback$cb {
     static SSL_set_info_callback$cb ofAddress(MemoryAddress addr) {
         return (jdk.incubator.foreign.MemoryAddress x0, int x1, int x2) -> {
             try {
-                
constants$20.SSL_set_info_callback$cb$MH.invokeExact((Addressable)addr, x0, x1, 
x2);
+                
constants$21.SSL_set_info_callback$cb$MH.invokeExact((Addressable)addr, x0, x1, 
x2);
             } catch (Throwable ex$) {
                 throw new AssertionError("should not reach here", ex$);
             }
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$0.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$0.java
index 41a70fd..7f39add 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$0.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$0.java
@@ -43,6 +43,20 @@ class constants$0 {
         
"(Ljdk/incubator/foreign/MemoryAddress;I)Ljdk/incubator/foreign/MemoryAddress;",
         constants$0.OPENSSL_sk_value$FUNC, false
     );
+    static final FunctionDescriptor OpenSSL_version_num$FUNC = 
FunctionDescriptor.of(C_LONG);
+    static final MethodHandle OpenSSL_version_num$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OpenSSL_version_num",
+        "()J",
+        constants$0.OpenSSL_version_num$FUNC, false
+    );
+    static final FunctionDescriptor OpenSSL_version$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_INT
+    );
+    static final MethodHandle OpenSSL_version$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OpenSSL_version",
+        "(I)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$0.OpenSSL_version$FUNC, false
+    );
     static final FunctionDescriptor CRYPTO_free$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER,
         C_POINTER,
@@ -59,22 +73,6 @@ class constants$0 {
         "()I",
         constants$0.FIPS_mode$FUNC, false
     );
-    static final FunctionDescriptor FIPS_mode_set$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_INT
-    );
-    static final MethodHandle FIPS_mode_set$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "FIPS_mode_set",
-        "(I)I",
-        constants$0.FIPS_mode_set$FUNC, false
-    );
-    static final FunctionDescriptor BIO_ctrl_pending$FUNC = 
FunctionDescriptor.of(C_LONG,
-        C_POINTER
-    );
-    static final MethodHandle BIO_ctrl_pending$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BIO_ctrl_pending",
-        "(Ljdk/incubator/foreign/MemoryAddress;)J",
-        constants$0.BIO_ctrl_pending$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$1.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$1.java
index 76ca2a3..29f4dc5 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$1.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$1.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$1 {
 
+    static final FunctionDescriptor FIPS_mode_set$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_INT
+    );
+    static final MethodHandle FIPS_mode_set$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "FIPS_mode_set",
+        "(I)I",
+        constants$1.FIPS_mode_set$FUNC, false
+    );
+    static final FunctionDescriptor BIO_ctrl_pending$FUNC = 
FunctionDescriptor.of(C_LONG,
+        C_POINTER
+    );
+    static final MethodHandle BIO_ctrl_pending$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BIO_ctrl_pending",
+        "(Ljdk/incubator/foreign/MemoryAddress;)J",
+        constants$1.BIO_ctrl_pending$FUNC, false
+    );
     static final FunctionDescriptor BIO_s_file$FUNC = 
FunctionDescriptor.of(C_POINTER);
     static final MethodHandle BIO_s_file$MH = RuntimeHelper.downcallHandle(
         openssl_h.LIBRARIES, "BIO_s_file",
@@ -57,26 +73,6 @@ class constants$1 {
         "(Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$1.BIO_free$FUNC, false
     );
-    static final FunctionDescriptor BIO_read$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle BIO_read$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BIO_read",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$1.BIO_read$FUNC, false
-    );
-    static final FunctionDescriptor BIO_write$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle BIO_write$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BIO_write",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$1.BIO_write$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$10.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$10.java
index 97d0236..e7c2c72 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$10.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$10.java
@@ -26,6 +26,28 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$10 {
 
+    static final FunctionDescriptor PEM_read_bio_DHparams$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle PEM_read_bio_DHparams$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "PEM_read_bio_DHparams",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$10.PEM_read_bio_DHparams$FUNC, false
+    );
+    static final FunctionDescriptor PEM_read_bio_PrivateKey$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle PEM_read_bio_PrivateKey$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "PEM_read_bio_PrivateKey",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$10.PEM_read_bio_PrivateKey$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_get_options$FUNC = 
FunctionDescriptor.of(C_LONG,
         C_POINTER
     );
@@ -60,25 +82,6 @@ class constants$10 {
         "(Ljdk/incubator/foreign/MemoryAddress;J)J",
         constants$10.SSL_CTX_set_options$FUNC, false
     );
-    static final FunctionDescriptor SSL_set_options$FUNC = 
FunctionDescriptor.of(C_LONG,
-        C_POINTER,
-        C_LONG
-    );
-    static final MethodHandle SSL_set_options$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_set_options",
-        "(Ljdk/incubator/foreign/MemoryAddress;J)J",
-        constants$10.SSL_set_options$FUNC, false
-    );
-    static final FunctionDescriptor SSL_get0_next_proto_negotiated$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get0_next_proto_negotiated$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get0_next_proto_negotiated",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$10.SSL_get0_next_proto_negotiated$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
index 32d35d0..051943c 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$11 {
 
+    static final FunctionDescriptor SSL_set_options$FUNC = 
FunctionDescriptor.of(C_LONG,
+        C_POINTER,
+        C_LONG
+    );
+    static final MethodHandle SSL_set_options$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_set_options",
+        "(Ljdk/incubator/foreign/MemoryAddress;J)J",
+        constants$11.SSL_set_options$FUNC, false
+    );
+    static final FunctionDescriptor SSL_get0_next_proto_negotiated$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get0_next_proto_negotiated$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get0_next_proto_negotiated",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$11.SSL_get0_next_proto_negotiated$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_set_alpn_select_cb$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER,
         C_POINTER,
@@ -63,22 +82,6 @@ class constants$11 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$11.SSL_CTX_set_cipher_list$FUNC, false
     );
-    static final FunctionDescriptor SSL_CTX_new$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_new$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_new",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$11.SSL_CTX_new$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CTX_free$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_free$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_free",
-        "(Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$11.SSL_CTX_free$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$12.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$12.java
index d9b8377..8b133a8 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$12.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$12.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$12 {
 
+    static final FunctionDescriptor SSL_CTX_new$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_new$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_new",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$12.SSL_CTX_new$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CTX_free$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_free$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_free",
+        "(Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$12.SSL_CTX_free$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_set_timeout$FUNC = 
FunctionDescriptor.of(C_LONG,
         C_POINTER,
         C_LONG
@@ -59,22 +75,6 @@ class constants$12 {
         
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$12.SSL_get_current_cipher$FUNC, false
     );
-    static final FunctionDescriptor SSL_CIPHER_get_name$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CIPHER_get_name$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CIPHER_get_name",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$12.SSL_CIPHER_get_name$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CIPHER_get_kx_nid$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CIPHER_get_kx_nid$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CIPHER_get_kx_nid",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$12.SSL_CIPHER_get_kx_nid$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$13.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$13.java
index d3d8cf3..3d586cc 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$13.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$13.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$13 {
 
+    static final FunctionDescriptor SSL_CIPHER_get_name$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CIPHER_get_name$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CIPHER_get_name",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$13.SSL_CIPHER_get_name$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CIPHER_get_kx_nid$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CIPHER_get_kx_nid$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CIPHER_get_kx_nid",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$13.SSL_CIPHER_get_kx_nid$FUNC, false
+    );
     static final FunctionDescriptor SSL_CIPHER_get_auth_nid$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER
     );
@@ -61,25 +77,6 @@ class constants$13 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$13.SSL_set_cipher_list$FUNC, false
     );
-    static final FunctionDescriptor SSL_set_verify$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER,
-        C_INT,
-        C_POINTER
-    );
-    static final MethodHandle SSL_set_verify$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_set_verify",
-        
"(Ljdk/incubator/foreign/MemoryAddress;ILjdk/incubator/foreign/MemoryAddress;)V",
-        constants$13.SSL_set_verify$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CTX_use_certificate_chain_file$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_use_certificate_chain_file$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_use_certificate_chain_file",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$13.SSL_CTX_use_certificate_chain_file$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$14.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$14.java
index bdba8b9..914b41c 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$14.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$14.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$14 {
 
+    static final FunctionDescriptor SSL_set_verify$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_INT,
+        C_POINTER
+    );
+    static final MethodHandle SSL_set_verify$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_set_verify",
+        
"(Ljdk/incubator/foreign/MemoryAddress;ILjdk/incubator/foreign/MemoryAddress;)V",
+        constants$14.SSL_set_verify$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CTX_use_certificate_chain_file$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_use_certificate_chain_file$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_use_certificate_chain_file",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$14.SSL_CTX_use_certificate_chain_file$FUNC, false
+    );
     static final FunctionDescriptor SSL_load_client_CA_file$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -60,22 +79,6 @@ class constants$14 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$14.SSL_SESSION_get_id$FUNC, false
     );
-    static final FunctionDescriptor SSL_get_peer_certificate$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get_peer_certificate$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get_peer_certificate",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$14.SSL_get_peer_certificate$FUNC, false
-    );
-    static final FunctionDescriptor SSL_get_peer_cert_chain$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get_peer_cert_chain$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get_peer_cert_chain",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$14.SSL_get_peer_cert_chain$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
index 4d72de1..2885289 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$15.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$15 {
 
+    static final FunctionDescriptor SSL_get_peer_certificate$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get_peer_certificate$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get_peer_certificate",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$15.SSL_get_peer_certificate$FUNC, false
+    );
+    static final FunctionDescriptor SSL_get_peer_cert_chain$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get_peer_cert_chain$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get_peer_cert_chain",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$15.SSL_get_peer_cert_chain$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_set_verify$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER,
         C_INT,
@@ -54,24 +70,6 @@ class constants$15 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
         constants$15.SSL_CTX_set_cert_verify_callback$FUNC, false
     );
-    static final FunctionDescriptor SSL_CTX_use_PrivateKey$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_use_PrivateKey$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_use_PrivateKey",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$15.SSL_CTX_use_PrivateKey$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CTX_use_certificate$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_use_certificate$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_use_certificate",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$15.SSL_CTX_use_certificate$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$16.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$16.java
index 4844080..5b02c50 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$16.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$16.java
@@ -26,6 +26,24 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$16 {
 
+    static final FunctionDescriptor SSL_CTX_use_PrivateKey$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_use_PrivateKey$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_use_PrivateKey",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$16.SSL_CTX_use_PrivateKey$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CTX_use_certificate$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_use_certificate$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_use_certificate",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$16.SSL_CTX_use_certificate$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_set_default_passwd_cb$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER,
         C_POINTER
@@ -61,24 +79,6 @@ class constants$16 {
         
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$16.SSL_new$FUNC, false
     );
-    static final FunctionDescriptor SSL_free$FUNC = FunctionDescriptor.ofVoid(
-        C_POINTER
-    );
-    static final MethodHandle SSL_free$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_free",
-        "(Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$16.SSL_free$FUNC, false
-    );
-    static final FunctionDescriptor SSL_read$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle SSL_read$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_read",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$16.SSL_read$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$17.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$17.java
index 8dc9109..0170ed6 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$17.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$17.java
@@ -26,6 +26,24 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$17 {
 
+    static final FunctionDescriptor SSL_free$FUNC = FunctionDescriptor.ofVoid(
+        C_POINTER
+    );
+    static final MethodHandle SSL_free$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_free",
+        "(Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$17.SSL_free$FUNC, false
+    );
+    static final FunctionDescriptor SSL_read$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle SSL_read$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_read",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$17.SSL_read$FUNC, false
+    );
     static final FunctionDescriptor SSL_write$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER,
         C_POINTER,
@@ -61,22 +79,6 @@ class constants$17 {
         "()Ljdk/incubator/foreign/MemoryAddress;",
         constants$17.TLS_server_method$FUNC, false
     );
-    static final FunctionDescriptor SSL_get_ciphers$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get_ciphers$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get_ciphers",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$17.SSL_get_ciphers$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CTX_get_ciphers$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_get_ciphers$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_get_ciphers",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$17.SSL_CTX_get_ciphers$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$18.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$18.java
index 59e299c..192567e 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$18.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$18.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$18 {
 
+    static final FunctionDescriptor SSL_get_ciphers$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get_ciphers$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get_ciphers",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$18.SSL_get_ciphers$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CTX_get_ciphers$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_get_ciphers$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_get_ciphers",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$18.SSL_CTX_get_ciphers$FUNC, false
+    );
     static final FunctionDescriptor SSL_do_handshake$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER
     );
@@ -58,23 +74,6 @@ class constants$18 {
         "(Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$18.SSL_shutdown$FUNC, false
     );
-    static final FunctionDescriptor SSL_verify_client_post_handshake$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle SSL_verify_client_post_handshake$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_verify_client_post_handshake",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$18.SSL_verify_client_post_handshake$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CTX_set_client_CA_list$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_set_client_CA_list$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_set_client_CA_list",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$18.SSL_CTX_set_client_CA_list$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$19.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$19.java
index 5b7daf3..209695b 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$19.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$19.java
@@ -26,6 +26,23 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$19 {
 
+    static final FunctionDescriptor SSL_verify_client_post_handshake$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle SSL_verify_client_post_handshake$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_verify_client_post_handshake",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$19.SSL_verify_client_post_handshake$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CTX_set_client_CA_list$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_set_client_CA_list$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_set_client_CA_list",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$19.SSL_CTX_set_client_CA_list$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_get_client_CA_list$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -59,22 +76,6 @@ class constants$19 {
         "(Ljdk/incubator/foreign/MemoryAddress;)V",
         constants$19.SSL_set_accept_state$FUNC, false
     );
-    static final FunctionDescriptor SSL_get_privatekey$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get_privatekey$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get_privatekey",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$19.SSL_get_privatekey$FUNC, false
-    );
-    static final FunctionDescriptor SSL_get_shutdown$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle SSL_get_shutdown$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_get_shutdown",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$19.SSL_get_shutdown$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$2.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$2.java
index af7b960..c66f4c84 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$2.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$2.java
@@ -26,6 +26,26 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$2 {
 
+    static final FunctionDescriptor BIO_read$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle BIO_read$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BIO_read",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$2.BIO_read$FUNC, false
+    );
+    static final FunctionDescriptor BIO_write$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle BIO_write$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BIO_write",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$2.BIO_write$FUNC, false
+    );
     static final FunctionDescriptor BIO_ctrl$FUNC = 
FunctionDescriptor.of(C_LONG,
         C_POINTER,
         C_INT,
@@ -60,21 +80,6 @@ class constants$2 {
         
"(Ljdk/incubator/foreign/MemoryAddress;JLjdk/incubator/foreign/MemoryAddress;J)I",
         constants$2.BIO_new_bio_pair$FUNC, false
     );
-    static final FunctionDescriptor BN_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle BN_new$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BN_new",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$2.BN_new$FUNC, false
-    );
-    static final FunctionDescriptor BN_set_word$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_LONG
-    );
-    static final MethodHandle BN_set_word$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BN_set_word",
-        "(Ljdk/incubator/foreign/MemoryAddress;J)I",
-        constants$2.BN_set_word$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$20.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$20.java
index 1f33cbc..fbf5820 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$20.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$20.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$20 {
 
+    static final FunctionDescriptor SSL_get_privatekey$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get_privatekey$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get_privatekey",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$20.SSL_get_privatekey$FUNC, false
+    );
+    static final FunctionDescriptor SSL_get_shutdown$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle SSL_get_shutdown$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_get_shutdown",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$20.SSL_get_shutdown$FUNC, false
+    );
     static final FunctionDescriptor SSL_CTX_set_default_verify_paths$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER
     );
@@ -57,19 +73,6 @@ class constants$20 {
         C_INT,
         C_INT
     );
-    static final MethodHandle SSL_set_info_callback$cb$MH = 
RuntimeHelper.downcallHandle(
-        "(Ljdk/incubator/foreign/MemoryAddress;II)V",
-        constants$20.SSL_set_info_callback$cb$FUNC, false
-    );
-    static final FunctionDescriptor SSL_set_info_callback$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_set_info_callback$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_set_info_callback",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$20.SSL_set_info_callback$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
index 08f69be..c7b6ee4 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$21.java
@@ -26,6 +26,24 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$21 {
 
+    static final FunctionDescriptor SSL_set_info_callback$cb$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_INT,
+        C_INT
+    );
+    static final MethodHandle SSL_set_info_callback$cb$MH = 
RuntimeHelper.downcallHandle(
+        "(Ljdk/incubator/foreign/MemoryAddress;II)V",
+        constants$21.SSL_set_info_callback$cb$FUNC, false
+    );
+    static final FunctionDescriptor SSL_set_info_callback$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_set_info_callback$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_set_info_callback",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$21.SSL_set_info_callback$FUNC, false
+    );
     static final FunctionDescriptor SSL_set_verify_result$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER,
         C_LONG
@@ -50,21 +68,6 @@ class constants$21 {
         
"(Ljdk/incubator/foreign/MemoryAddress;II)Ljdk/incubator/foreign/MemoryAddress;",
         constants$21.SSL_CTX_set_tmp_dh_callback$dh$FUNC, false
     );
-    static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CTX_set_tmp_dh_callback$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CTX_set_tmp_dh_callback",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$21.SSL_CTX_set_tmp_dh_callback$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CONF_CTX_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle SSL_CONF_CTX_new$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CONF_CTX_new",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$21.SSL_CONF_CTX_new$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
index ca44c3b..68f384c 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$22.java
@@ -26,6 +26,21 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$22 {
 
+    static final FunctionDescriptor SSL_CTX_set_tmp_dh_callback$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CTX_set_tmp_dh_callback$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CTX_set_tmp_dh_callback",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$22.SSL_CTX_set_tmp_dh_callback$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CONF_CTX_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle SSL_CONF_CTX_new$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CONF_CTX_new",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$22.SSL_CONF_CTX_new$FUNC, false
+    );
     static final FunctionDescriptor SSL_CONF_CTX_finish$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER
     );
@@ -60,25 +75,6 @@ class constants$22 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
         constants$22.SSL_CONF_CTX_set_ssl_ctx$FUNC, false
     );
-    static final FunctionDescriptor SSL_CONF_cmd$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CONF_cmd$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CONF_cmd",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$22.SSL_CONF_cmd$FUNC, false
-    );
-    static final FunctionDescriptor SSL_CONF_cmd_value_type$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle SSL_CONF_cmd_value_type$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "SSL_CONF_cmd_value_type",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$22.SSL_CONF_cmd_value_type$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$23.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$23.java
index b4338e7..5f130ca 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$23.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$23.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$23 {
 
+    static final FunctionDescriptor SSL_CONF_cmd$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CONF_cmd$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CONF_cmd",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$23.SSL_CONF_cmd$FUNC, false
+    );
+    static final FunctionDescriptor SSL_CONF_cmd_value_type$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle SSL_CONF_cmd_value_type$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "SSL_CONF_cmd_value_type",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$23.SSL_CONF_cmd_value_type$FUNC, false
+    );
     static final FunctionDescriptor OPENSSL_init_ssl$FUNC = 
FunctionDescriptor.of(C_INT,
         C_LONG,
         C_POINTER
@@ -53,25 +72,6 @@ class constants$23 {
         "()V",
         constants$23.ERR_clear_error$FUNC, false
     );
-    static final FunctionDescriptor ERR_error_string$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_LONG,
-        C_POINTER
-    );
-    static final MethodHandle ERR_error_string$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "ERR_error_string",
-        
"(JLjdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$23.ERR_error_string$FUNC, false
-    );
-    static final FunctionDescriptor PKCS12_verify_mac$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle PKCS12_verify_mac$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "PKCS12_verify_mac",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$23.PKCS12_verify_mac$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$24.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$24.java
index 7724da3..82422ab 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$24.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$24.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$24 {
 
+    static final FunctionDescriptor ERR_error_string$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_LONG,
+        C_POINTER
+    );
+    static final MethodHandle ERR_error_string$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "ERR_error_string",
+        
"(JLjdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$24.ERR_error_string$FUNC, false
+    );
+    static final FunctionDescriptor PKCS12_verify_mac$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle PKCS12_verify_mac$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "PKCS12_verify_mac",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$24.PKCS12_verify_mac$FUNC, false
+    );
     static final FunctionDescriptor PKCS12_free$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER
     );
@@ -64,24 +83,6 @@ class constants$24 {
         "(Ljdk/incubator/foreign/MemoryAddress;I)V",
         constants$24.RAND_seed$FUNC, false
     );
-    static final FunctionDescriptor RAND_load_file$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_LONG
-    );
-    static final MethodHandle RAND_load_file$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "RAND_load_file",
-        "(Ljdk/incubator/foreign/MemoryAddress;J)I",
-        constants$24.RAND_load_file$FUNC, false
-    );
-    static final FunctionDescriptor X509_check_issued$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle X509_check_issued$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_check_issued",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$24.X509_check_issued$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$25.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$25.java
index 47e414a..89f7a5b 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$25.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$25.java
@@ -26,6 +26,24 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$25 {
 
+    static final FunctionDescriptor RAND_load_file$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_LONG
+    );
+    static final MethodHandle RAND_load_file$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "RAND_load_file",
+        "(Ljdk/incubator/foreign/MemoryAddress;J)I",
+        constants$25.RAND_load_file$FUNC, false
+    );
+    static final FunctionDescriptor X509_check_issued$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle X509_check_issued$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_check_issued",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$25.X509_check_issued$FUNC, false
+    );
     static final FunctionDescriptor ENGINE_by_id$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -59,26 +77,6 @@ class constants$25 {
         "(Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$25.ENGINE_free$FUNC, false
     );
-    static final FunctionDescriptor ENGINE_load_private_key$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle ENGINE_load_private_key$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "ENGINE_load_private_key",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$25.ENGINE_load_private_key$FUNC, false
-    );
-    static final FunctionDescriptor ENGINE_set_default$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle ENGINE_set_default$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "ENGINE_set_default",
-        "(Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$25.ENGINE_set_default$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$26.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$26.java
index 310f94b..a253272 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$26.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$26.java
@@ -26,6 +26,26 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$26 {
 
+    static final FunctionDescriptor ENGINE_load_private_key$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle ENGINE_load_private_key$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "ENGINE_load_private_key",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$26.ENGINE_load_private_key$FUNC, false
+    );
+    static final FunctionDescriptor ENGINE_set_default$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle ENGINE_set_default$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "ENGINE_set_default",
+        "(Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$26.ENGINE_set_default$FUNC, false
+    );
     static final FunctionDescriptor OCSP_cert_to_id$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER,
         C_POINTER,
@@ -61,25 +81,6 @@ class constants$26 {
         
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$26.OCSP_response_get1_basic$FUNC, false
     );
-    static final FunctionDescriptor OCSP_resp_get0$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle OCSP_resp_get0$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "OCSP_resp_get0",
-        
"(Ljdk/incubator/foreign/MemoryAddress;I)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$26.OCSP_resp_get0$FUNC, false
-    );
-    static final FunctionDescriptor OCSP_resp_find$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER,
-        C_INT
-    );
-    static final MethodHandle OCSP_resp_find$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "OCSP_resp_find",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
-        constants$26.OCSP_resp_find$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$27.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$27.java
index bfba690..698b463 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$27.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$27.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$27 {
 
+    static final FunctionDescriptor OCSP_resp_get0$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle OCSP_resp_get0$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OCSP_resp_get0",
+        
"(Ljdk/incubator/foreign/MemoryAddress;I)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$27.OCSP_resp_get0$FUNC, false
+    );
+    static final FunctionDescriptor OCSP_resp_find$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER,
+        C_INT
+    );
+    static final MethodHandle OCSP_resp_find$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OCSP_resp_find",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;I)I",
+        constants$27.OCSP_resp_find$FUNC, false
+    );
     static final FunctionDescriptor OCSP_single_get0_status$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER,
         C_POINTER,
@@ -64,20 +83,6 @@ class constants$27 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;J)Ljdk/incubator/foreign/MemoryAddress;",
         constants$27.d2i_OCSP_RESPONSE$FUNC, false
     );
-    static final FunctionDescriptor OCSP_CERTID_free$FUNC = 
FunctionDescriptor.ofVoid(
-        C_POINTER
-    );
-    static final MethodHandle OCSP_CERTID_free$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "OCSP_CERTID_free",
-        "(Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$27.OCSP_CERTID_free$FUNC, false
-    );
-    static final FunctionDescriptor OCSP_REQUEST_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle OCSP_REQUEST_new$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "OCSP_REQUEST_new",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$27.OCSP_REQUEST_new$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$28.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$28.java
index 0217030..8716ab1 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$28.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$28.java
@@ -26,6 +26,20 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$28 {
 
+    static final FunctionDescriptor OCSP_CERTID_free$FUNC = 
FunctionDescriptor.ofVoid(
+        C_POINTER
+    );
+    static final MethodHandle OCSP_CERTID_free$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OCSP_CERTID_free",
+        "(Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$28.OCSP_CERTID_free$FUNC, false
+    );
+    static final FunctionDescriptor OCSP_REQUEST_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle OCSP_REQUEST_new$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "OCSP_REQUEST_new",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$28.OCSP_REQUEST_new$FUNC, false
+    );
     static final FunctionDescriptor OCSP_REQUEST_free$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER
     );
@@ -43,10 +57,7 @@ class constants$28 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
         constants$28.i2d_OCSP_REQUEST$FUNC, false
     );
-    static final MemorySegment OPENSSL_VERSION_TEXT$SEGMENT = 
CLinker.toCString("OpenSSL 1.1.1l  FIPS 24 Aug 2021", 
ResourceScope.newImplicitScope());
-    static final MemorySegment SHLIB_VERSION_HISTORY$SEGMENT = 
CLinker.toCString("", ResourceScope.newImplicitScope());
-    static final MemorySegment SHLIB_VERSION_NUMBER$SEGMENT = 
CLinker.toCString("1.1", ResourceScope.newImplicitScope());
-    static final MemorySegment OPENSSL_FILE$SEGMENT = 
CLinker.toCString("/tmp/jextract$6761937692400069639.h", 
ResourceScope.newImplicitScope());
+    static final MemorySegment OPENSSL_FILE$SEGMENT = 
CLinker.toCString("/tmp/jextract$18067138764655173084.h", 
ResourceScope.newImplicitScope());
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
deleted file mode 100644
index b852ba3..0000000
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$29.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated by jextract
-
-package org.apache.tomcat.util.openssl;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.VarHandle;
-import java.nio.ByteOrder;
-import jdk.incubator.foreign.*;
-import static jdk.incubator.foreign.CLinker.*;
-class constants$29 {
-
-    static final MemorySegment SSL_TXT_DSS$SEGMENT = CLinker.toCString("DSS", 
ResourceScope.newImplicitScope());
-    static final MemorySegment SSL_TXT_DH$SEGMENT = CLinker.toCString("DH", 
ResourceScope.newImplicitScope());
-    static final MemorySegment SSL_TXT_RSA$SEGMENT = CLinker.toCString("RSA", 
ResourceScope.newImplicitScope());
-    static final MemorySegment SSL_TXT_ECDH$SEGMENT = 
CLinker.toCString("ECDH", ResourceScope.newImplicitScope());
-    static final MemorySegment SSL_TXT_ECDSA$SEGMENT = 
CLinker.toCString("ECDSA", ResourceScope.newImplicitScope());
-}
-
-
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$3.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$3.java
index 792fe28..4f187ec 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$3.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$3.java
@@ -26,6 +26,21 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$3 {
 
+    static final FunctionDescriptor BN_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle BN_new$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BN_new",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$3.BN_new$FUNC, false
+    );
+    static final FunctionDescriptor BN_set_word$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_LONG
+    );
+    static final MethodHandle BN_set_word$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BN_set_word",
+        "(Ljdk/incubator/foreign/MemoryAddress;J)I",
+        constants$3.BN_set_word$FUNC, false
+    );
     static final FunctionDescriptor BN_get_rfc2409_prime_768$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -58,22 +73,6 @@ class constants$3 {
         
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$3.BN_get_rfc3526_prime_2048$FUNC, false
     );
-    static final FunctionDescriptor BN_get_rfc3526_prime_3072$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle BN_get_rfc3526_prime_3072$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BN_get_rfc3526_prime_3072",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$3.BN_get_rfc3526_prime_3072$FUNC, false
-    );
-    static final FunctionDescriptor BN_get_rfc3526_prime_4096$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle BN_get_rfc3526_prime_4096$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "BN_get_rfc3526_prime_4096",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$3.BN_get_rfc3526_prime_4096$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$4.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$4.java
index 07b38e4..dcb0a46 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$4.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$4.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$4 {
 
+    static final FunctionDescriptor BN_get_rfc3526_prime_3072$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle BN_get_rfc3526_prime_3072$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BN_get_rfc3526_prime_3072",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$4.BN_get_rfc3526_prime_3072$FUNC, false
+    );
+    static final FunctionDescriptor BN_get_rfc3526_prime_4096$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle BN_get_rfc3526_prime_4096$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "BN_get_rfc3526_prime_4096",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$4.BN_get_rfc3526_prime_4096$FUNC, false
+    );
     static final FunctionDescriptor BN_get_rfc3526_prime_6144$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -58,22 +74,6 @@ class constants$4 {
         
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$4.ASN1_STRING_get0_data$FUNC, false
     );
-    static final FunctionDescriptor EVP_PKEY_base_id$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle EVP_PKEY_base_id$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "EVP_PKEY_base_id",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$4.EVP_PKEY_base_id$FUNC, false
-    );
-    static final FunctionDescriptor EVP_PKEY_bits$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle EVP_PKEY_bits$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "EVP_PKEY_bits",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$4.EVP_PKEY_bits$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$5.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$5.java
index 893006d..d5e4f08 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$5.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$5.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$5 {
 
+    static final FunctionDescriptor EVP_PKEY_base_id$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle EVP_PKEY_base_id$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "EVP_PKEY_base_id",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$5.EVP_PKEY_base_id$FUNC, false
+    );
+    static final FunctionDescriptor EVP_PKEY_bits$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle EVP_PKEY_bits$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "EVP_PKEY_bits",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$5.EVP_PKEY_bits$FUNC, false
+    );
     static final FunctionDescriptor EC_GROUP_free$FUNC = 
FunctionDescriptor.ofVoid(
         C_POINTER
     );
@@ -58,20 +74,6 @@ class constants$5 {
         "(Ljdk/incubator/foreign/MemoryAddress;)V",
         constants$5.EC_KEY_free$FUNC, false
     );
-    static final FunctionDescriptor DH_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle DH_new$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "DH_new",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$5.DH_new$FUNC, false
-    );
-    static final FunctionDescriptor DH_free$FUNC = FunctionDescriptor.ofVoid(
-        C_POINTER
-    );
-    static final MethodHandle DH_free$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "DH_free",
-        "(Ljdk/incubator/foreign/MemoryAddress;)V",
-        constants$5.DH_free$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$6.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$6.java
index a5152a1..1b006ca 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$6.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$6.java
@@ -26,6 +26,20 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$6 {
 
+    static final FunctionDescriptor DH_new$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle DH_new$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "DH_new",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$6.DH_new$FUNC, false
+    );
+    static final FunctionDescriptor DH_free$FUNC = FunctionDescriptor.ofVoid(
+        C_POINTER
+    );
+    static final MethodHandle DH_free$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "DH_free",
+        "(Ljdk/incubator/foreign/MemoryAddress;)V",
+        constants$6.DH_free$FUNC, false
+    );
     static final FunctionDescriptor DH_set0_pqg$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER,
         C_POINTER,
@@ -63,18 +77,6 @@ class constants$6 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$6.X509_STORE_add_lookup$FUNC, false
     );
-    static final FunctionDescriptor X509_LOOKUP_hash_dir$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle X509_LOOKUP_hash_dir$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_LOOKUP_hash_dir",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$6.X509_LOOKUP_hash_dir$FUNC, false
-    );
-    static final FunctionDescriptor X509_LOOKUP_file$FUNC = 
FunctionDescriptor.of(C_POINTER);
-    static final MethodHandle X509_LOOKUP_file$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_LOOKUP_file",
-        "()Ljdk/incubator/foreign/MemoryAddress;",
-        constants$6.X509_LOOKUP_file$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$7.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$7.java
index 5a7848b..8abd155 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$7.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$7.java
@@ -26,6 +26,18 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$7 {
 
+    static final FunctionDescriptor X509_LOOKUP_hash_dir$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle X509_LOOKUP_hash_dir$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_LOOKUP_hash_dir",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$7.X509_LOOKUP_hash_dir$FUNC, false
+    );
+    static final FunctionDescriptor X509_LOOKUP_file$FUNC = 
FunctionDescriptor.of(C_POINTER);
+    static final MethodHandle X509_LOOKUP_file$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_LOOKUP_file",
+        "()Ljdk/incubator/foreign/MemoryAddress;",
+        constants$7.X509_LOOKUP_file$FUNC, false
+    );
     static final FunctionDescriptor X509_LOOKUP_ctrl$FUNC = 
FunctionDescriptor.of(C_INT,
         C_POINTER,
         C_INT,
@@ -64,22 +76,6 @@ class constants$7 {
         "(Ljdk/incubator/foreign/MemoryAddress;I)V",
         constants$7.X509_STORE_CTX_set_error$FUNC, false
     );
-    static final FunctionDescriptor X509_STORE_CTX_get_error_depth$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER
-    );
-    static final MethodHandle X509_STORE_CTX_get_error_depth$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_STORE_CTX_get_error_depth",
-        "(Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$7.X509_STORE_CTX_get_error_depth$FUNC, false
-    );
-    static final FunctionDescriptor X509_STORE_CTX_get_current_cert$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle X509_STORE_CTX_get_current_cert$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_STORE_CTX_get_current_cert",
-        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$7.X509_STORE_CTX_get_current_cert$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$8.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$8.java
index 2d13eec..dc83b95 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$8.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$8.java
@@ -26,6 +26,22 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$8 {
 
+    static final FunctionDescriptor X509_STORE_CTX_get_error_depth$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER
+    );
+    static final MethodHandle X509_STORE_CTX_get_error_depth$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_STORE_CTX_get_error_depth",
+        "(Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$8.X509_STORE_CTX_get_error_depth$FUNC, false
+    );
+    static final FunctionDescriptor X509_STORE_CTX_get_current_cert$FUNC = 
FunctionDescriptor.of(C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle X509_STORE_CTX_get_current_cert$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_STORE_CTX_get_current_cert",
+        
"(Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
+        constants$8.X509_STORE_CTX_get_current_cert$FUNC, false
+    );
     static final FunctionDescriptor X509_STORE_CTX_get0_current_issuer$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER
     );
@@ -61,25 +77,6 @@ class constants$8 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;J)Ljdk/incubator/foreign/MemoryAddress;",
         constants$8.d2i_X509$FUNC, false
     );
-    static final FunctionDescriptor i2d_X509$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle i2d_X509$MH = RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "i2d_X509",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
-        constants$8.i2d_X509$FUNC, false
-    );
-    static final FunctionDescriptor X509_get_ext_by_NID$FUNC = 
FunctionDescriptor.of(C_INT,
-        C_POINTER,
-        C_INT,
-        C_INT
-    );
-    static final MethodHandle X509_get_ext_by_NID$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "X509_get_ext_by_NID",
-        "(Ljdk/incubator/foreign/MemoryAddress;II)I",
-        constants$8.X509_get_ext_by_NID$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$9.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$9.java
index 692c460..76c9cb4 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$9.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$9.java
@@ -26,6 +26,25 @@ import jdk.incubator.foreign.*;
 import static jdk.incubator.foreign.CLinker.*;
 class constants$9 {
 
+    static final FunctionDescriptor i2d_X509$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_POINTER
+    );
+    static final MethodHandle i2d_X509$MH = RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "i2d_X509",
+        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)I",
+        constants$9.i2d_X509$FUNC, false
+    );
+    static final FunctionDescriptor X509_get_ext_by_NID$FUNC = 
FunctionDescriptor.of(C_INT,
+        C_POINTER,
+        C_INT,
+        C_INT
+    );
+    static final MethodHandle X509_get_ext_by_NID$MH = 
RuntimeHelper.downcallHandle(
+        openssl_h.LIBRARIES, "X509_get_ext_by_NID",
+        "(Ljdk/incubator/foreign/MemoryAddress;II)I",
+        constants$9.X509_get_ext_by_NID$FUNC, false
+    );
     static final FunctionDescriptor X509_get_ext$FUNC = 
FunctionDescriptor.of(C_POINTER,
         C_POINTER,
         C_INT
@@ -65,28 +84,6 @@ class constants$9 {
         
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
         constants$9.PEM_read_bio_ECPKParameters$FUNC, false
     );
-    static final FunctionDescriptor PEM_read_bio_DHparams$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle PEM_read_bio_DHparams$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "PEM_read_bio_DHparams",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$9.PEM_read_bio_DHparams$FUNC, false
-    );
-    static final FunctionDescriptor PEM_read_bio_PrivateKey$FUNC = 
FunctionDescriptor.of(C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER,
-        C_POINTER
-    );
-    static final MethodHandle PEM_read_bio_PrivateKey$MH = 
RuntimeHelper.downcallHandle(
-        openssl_h.LIBRARIES, "PEM_read_bio_PrivateKey",
-        
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)Ljdk/incubator/foreign/MemoryAddress;",
-        constants$9.PEM_read_bio_PrivateKey$FUNC, false
-    );
 }
 
 
diff --git 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
index cf50924..6e23919 100644
--- 
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
+++ 
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -272,6 +272,28 @@ public class openssl_h  {
             throw new AssertionError("should not reach here", ex$);
         }
     }
+    public static MethodHandle OpenSSL_version_num$MH() {
+        return 
RuntimeHelper.requireNonNull(constants$0.OpenSSL_version_num$MH,"OpenSSL_version_num");
+    }
+    public static long OpenSSL_version_num () {
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$0.OpenSSL_version_num$MH, 
"OpenSSL_version_num");
+        try {
+            return (long)mh$.invokeExact();
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
+    public static MethodHandle OpenSSL_version$MH() {
+        return 
RuntimeHelper.requireNonNull(constants$0.OpenSSL_version$MH,"OpenSSL_version");
+    }
+    public static MemoryAddress OpenSSL_version ( int type) {
+        var mh$ = RuntimeHelper.requireNonNull(constants$0.OpenSSL_version$MH, 
"OpenSSL_version");
+        try {
+            return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(type);
+        } catch (Throwable ex$) {
+            throw new AssertionError("should not reach here", ex$);
+        }
+    }
     public static MethodHandle CRYPTO_free$MH() {
         return 
RuntimeHelper.requireNonNull(constants$0.CRYPTO_free$MH,"CRYPTO_free");
     }
@@ -295,10 +317,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle FIPS_mode_set$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$0.FIPS_mode_set$MH,"FIPS_mode_set");
+        return 
RuntimeHelper.requireNonNull(constants$1.FIPS_mode_set$MH,"FIPS_mode_set");
     }
     public static int FIPS_mode_set ( int r) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$0.FIPS_mode_set$MH, 
"FIPS_mode_set");
+        var mh$ = RuntimeHelper.requireNonNull(constants$1.FIPS_mode_set$MH, 
"FIPS_mode_set");
         try {
             return (int)mh$.invokeExact(r);
         } catch (Throwable ex$) {
@@ -306,10 +328,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BIO_ctrl_pending$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$0.BIO_ctrl_pending$MH,"BIO_ctrl_pending");
+        return 
RuntimeHelper.requireNonNull(constants$1.BIO_ctrl_pending$MH,"BIO_ctrl_pending");
     }
     public static long BIO_ctrl_pending ( Addressable b) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$0.BIO_ctrl_pending$MH, 
"BIO_ctrl_pending");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$1.BIO_ctrl_pending$MH, 
"BIO_ctrl_pending");
         try {
             return (long)mh$.invokeExact(b.address());
         } catch (Throwable ex$) {
@@ -361,10 +383,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BIO_read$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$1.BIO_read$MH,"BIO_read");
+        return 
RuntimeHelper.requireNonNull(constants$2.BIO_read$MH,"BIO_read");
     }
     public static int BIO_read ( Addressable b,  Addressable data,  int dlen) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$1.BIO_read$MH, 
"BIO_read");
+        var mh$ = RuntimeHelper.requireNonNull(constants$2.BIO_read$MH, 
"BIO_read");
         try {
             return (int)mh$.invokeExact(b.address(), data.address(), dlen);
         } catch (Throwable ex$) {
@@ -372,10 +394,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BIO_write$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$1.BIO_write$MH,"BIO_write");
+        return 
RuntimeHelper.requireNonNull(constants$2.BIO_write$MH,"BIO_write");
     }
     public static int BIO_write ( Addressable b,  Addressable data,  int dlen) 
{
-        var mh$ = RuntimeHelper.requireNonNull(constants$1.BIO_write$MH, 
"BIO_write");
+        var mh$ = RuntimeHelper.requireNonNull(constants$2.BIO_write$MH, 
"BIO_write");
         try {
             return (int)mh$.invokeExact(b.address(), data.address(), dlen);
         } catch (Throwable ex$) {
@@ -427,10 +449,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BN_new$MH() {
-        return RuntimeHelper.requireNonNull(constants$2.BN_new$MH,"BN_new");
+        return RuntimeHelper.requireNonNull(constants$3.BN_new$MH,"BN_new");
     }
     public static MemoryAddress BN_new () {
-        var mh$ = RuntimeHelper.requireNonNull(constants$2.BN_new$MH, 
"BN_new");
+        var mh$ = RuntimeHelper.requireNonNull(constants$3.BN_new$MH, 
"BN_new");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -438,10 +460,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BN_set_word$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$2.BN_set_word$MH,"BN_set_word");
+        return 
RuntimeHelper.requireNonNull(constants$3.BN_set_word$MH,"BN_set_word");
     }
     public static int BN_set_word ( Addressable a,  long w) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$2.BN_set_word$MH, 
"BN_set_word");
+        var mh$ = RuntimeHelper.requireNonNull(constants$3.BN_set_word$MH, 
"BN_set_word");
         try {
             return (int)mh$.invokeExact(a.address(), w);
         } catch (Throwable ex$) {
@@ -493,10 +515,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BN_get_rfc3526_prime_3072$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$3.BN_get_rfc3526_prime_3072$MH,"BN_get_rfc3526_prime_3072");
+        return 
RuntimeHelper.requireNonNull(constants$4.BN_get_rfc3526_prime_3072$MH,"BN_get_rfc3526_prime_3072");
     }
     public static MemoryAddress BN_get_rfc3526_prime_3072 ( Addressable bn) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$3.BN_get_rfc3526_prime_3072$MH, 
"BN_get_rfc3526_prime_3072");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$4.BN_get_rfc3526_prime_3072$MH, 
"BN_get_rfc3526_prime_3072");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(bn.address());
         } catch (Throwable ex$) {
@@ -504,10 +526,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle BN_get_rfc3526_prime_4096$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$3.BN_get_rfc3526_prime_4096$MH,"BN_get_rfc3526_prime_4096");
+        return 
RuntimeHelper.requireNonNull(constants$4.BN_get_rfc3526_prime_4096$MH,"BN_get_rfc3526_prime_4096");
     }
     public static MemoryAddress BN_get_rfc3526_prime_4096 ( Addressable bn) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$3.BN_get_rfc3526_prime_4096$MH, 
"BN_get_rfc3526_prime_4096");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$4.BN_get_rfc3526_prime_4096$MH, 
"BN_get_rfc3526_prime_4096");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(bn.address());
         } catch (Throwable ex$) {
@@ -559,10 +581,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle EVP_PKEY_base_id$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$4.EVP_PKEY_base_id$MH,"EVP_PKEY_base_id");
+        return 
RuntimeHelper.requireNonNull(constants$5.EVP_PKEY_base_id$MH,"EVP_PKEY_base_id");
     }
     public static int EVP_PKEY_base_id ( Addressable pkey) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$4.EVP_PKEY_base_id$MH, 
"EVP_PKEY_base_id");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$5.EVP_PKEY_base_id$MH, 
"EVP_PKEY_base_id");
         try {
             return (int)mh$.invokeExact(pkey.address());
         } catch (Throwable ex$) {
@@ -570,10 +592,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle EVP_PKEY_bits$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$4.EVP_PKEY_bits$MH,"EVP_PKEY_bits");
+        return 
RuntimeHelper.requireNonNull(constants$5.EVP_PKEY_bits$MH,"EVP_PKEY_bits");
     }
     public static int EVP_PKEY_bits ( Addressable pkey) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$4.EVP_PKEY_bits$MH, 
"EVP_PKEY_bits");
+        var mh$ = RuntimeHelper.requireNonNull(constants$5.EVP_PKEY_bits$MH, 
"EVP_PKEY_bits");
         try {
             return (int)mh$.invokeExact(pkey.address());
         } catch (Throwable ex$) {
@@ -625,10 +647,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle DH_new$MH() {
-        return RuntimeHelper.requireNonNull(constants$5.DH_new$MH,"DH_new");
+        return RuntimeHelper.requireNonNull(constants$6.DH_new$MH,"DH_new");
     }
     public static MemoryAddress DH_new () {
-        var mh$ = RuntimeHelper.requireNonNull(constants$5.DH_new$MH, 
"DH_new");
+        var mh$ = RuntimeHelper.requireNonNull(constants$6.DH_new$MH, 
"DH_new");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -636,10 +658,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle DH_free$MH() {
-        return RuntimeHelper.requireNonNull(constants$5.DH_free$MH,"DH_free");
+        return RuntimeHelper.requireNonNull(constants$6.DH_free$MH,"DH_free");
     }
     public static void DH_free ( Addressable dh) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$5.DH_free$MH, 
"DH_free");
+        var mh$ = RuntimeHelper.requireNonNull(constants$6.DH_free$MH, 
"DH_free");
         try {
             mh$.invokeExact(dh.address());
         } catch (Throwable ex$) {
@@ -691,10 +713,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_LOOKUP_hash_dir$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$6.X509_LOOKUP_hash_dir$MH,"X509_LOOKUP_hash_dir");
+        return 
RuntimeHelper.requireNonNull(constants$7.X509_LOOKUP_hash_dir$MH,"X509_LOOKUP_hash_dir");
     }
     public static MemoryAddress X509_LOOKUP_hash_dir () {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$6.X509_LOOKUP_hash_dir$MH, 
"X509_LOOKUP_hash_dir");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$7.X509_LOOKUP_hash_dir$MH, 
"X509_LOOKUP_hash_dir");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -702,10 +724,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_LOOKUP_file$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$6.X509_LOOKUP_file$MH,"X509_LOOKUP_file");
+        return 
RuntimeHelper.requireNonNull(constants$7.X509_LOOKUP_file$MH,"X509_LOOKUP_file");
     }
     public static MemoryAddress X509_LOOKUP_file () {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$6.X509_LOOKUP_file$MH, 
"X509_LOOKUP_file");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$7.X509_LOOKUP_file$MH, 
"X509_LOOKUP_file");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -757,10 +779,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_STORE_CTX_get_error_depth$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$7.X509_STORE_CTX_get_error_depth$MH,"X509_STORE_CTX_get_error_depth");
+        return 
RuntimeHelper.requireNonNull(constants$8.X509_STORE_CTX_get_error_depth$MH,"X509_STORE_CTX_get_error_depth");
     }
     public static int X509_STORE_CTX_get_error_depth ( Addressable ctx) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$7.X509_STORE_CTX_get_error_depth$MH, 
"X509_STORE_CTX_get_error_depth");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$8.X509_STORE_CTX_get_error_depth$MH, 
"X509_STORE_CTX_get_error_depth");
         try {
             return (int)mh$.invokeExact(ctx.address());
         } catch (Throwable ex$) {
@@ -768,10 +790,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_STORE_CTX_get_current_cert$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$7.X509_STORE_CTX_get_current_cert$MH,"X509_STORE_CTX_get_current_cert");
+        return 
RuntimeHelper.requireNonNull(constants$8.X509_STORE_CTX_get_current_cert$MH,"X509_STORE_CTX_get_current_cert");
     }
     public static MemoryAddress X509_STORE_CTX_get_current_cert ( Addressable 
ctx) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$7.X509_STORE_CTX_get_current_cert$MH, 
"X509_STORE_CTX_get_current_cert");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$8.X509_STORE_CTX_get_current_cert$MH, 
"X509_STORE_CTX_get_current_cert");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(ctx.address());
         } catch (Throwable ex$) {
@@ -823,10 +845,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle i2d_X509$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$8.i2d_X509$MH,"i2d_X509");
+        return 
RuntimeHelper.requireNonNull(constants$9.i2d_X509$MH,"i2d_X509");
     }
     public static int i2d_X509 ( Addressable a,  Addressable out) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$8.i2d_X509$MH, 
"i2d_X509");
+        var mh$ = RuntimeHelper.requireNonNull(constants$9.i2d_X509$MH, 
"i2d_X509");
         try {
             return (int)mh$.invokeExact(a.address(), out.address());
         } catch (Throwable ex$) {
@@ -834,10 +856,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_get_ext_by_NID$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$8.X509_get_ext_by_NID$MH,"X509_get_ext_by_NID");
+        return 
RuntimeHelper.requireNonNull(constants$9.X509_get_ext_by_NID$MH,"X509_get_ext_by_NID");
     }
     public static int X509_get_ext_by_NID ( Addressable x,  int nid,  int 
lastpos) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$8.X509_get_ext_by_NID$MH, 
"X509_get_ext_by_NID");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$9.X509_get_ext_by_NID$MH, 
"X509_get_ext_by_NID");
         try {
             return (int)mh$.invokeExact(x.address(), nid, lastpos);
         } catch (Throwable ex$) {
@@ -889,10 +911,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle PEM_read_bio_DHparams$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$9.PEM_read_bio_DHparams$MH,"PEM_read_bio_DHparams");
+        return 
RuntimeHelper.requireNonNull(constants$10.PEM_read_bio_DHparams$MH,"PEM_read_bio_DHparams");
     }
     public static MemoryAddress PEM_read_bio_DHparams ( Addressable bp,  
Addressable x,  Addressable cb,  Addressable u) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$9.PEM_read_bio_DHparams$MH, 
"PEM_read_bio_DHparams");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$10.PEM_read_bio_DHparams$MH, 
"PEM_read_bio_DHparams");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(bp.address(), x.address(), 
cb.address(), u.address());
         } catch (Throwable ex$) {
@@ -900,10 +922,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle PEM_read_bio_PrivateKey$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$9.PEM_read_bio_PrivateKey$MH,"PEM_read_bio_PrivateKey");
+        return 
RuntimeHelper.requireNonNull(constants$10.PEM_read_bio_PrivateKey$MH,"PEM_read_bio_PrivateKey");
     }
     public static MemoryAddress PEM_read_bio_PrivateKey ( Addressable bp,  
Addressable x,  Addressable cb,  Addressable u) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$9.PEM_read_bio_PrivateKey$MH, 
"PEM_read_bio_PrivateKey");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$10.PEM_read_bio_PrivateKey$MH, 
"PEM_read_bio_PrivateKey");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(bp.address(), x.address(), 
cb.address(), u.address());
         } catch (Throwable ex$) {
@@ -955,10 +977,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_set_options$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$10.SSL_set_options$MH,"SSL_set_options");
+        return 
RuntimeHelper.requireNonNull(constants$11.SSL_set_options$MH,"SSL_set_options");
     }
     public static long SSL_set_options ( Addressable s,  long op) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$10.SSL_set_options$MH, 
"SSL_set_options");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$11.SSL_set_options$MH, 
"SSL_set_options");
         try {
             return (long)mh$.invokeExact(s.address(), op);
         } catch (Throwable ex$) {
@@ -966,10 +988,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get0_next_proto_negotiated$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$10.SSL_get0_next_proto_negotiated$MH,"SSL_get0_next_proto_negotiated");
+        return 
RuntimeHelper.requireNonNull(constants$11.SSL_get0_next_proto_negotiated$MH,"SSL_get0_next_proto_negotiated");
     }
     public static void SSL_get0_next_proto_negotiated ( Addressable s,  
Addressable data,  Addressable len) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$10.SSL_get0_next_proto_negotiated$MH, 
"SSL_get0_next_proto_negotiated");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$11.SSL_get0_next_proto_negotiated$MH, 
"SSL_get0_next_proto_negotiated");
         try {
             mh$.invokeExact(s.address(), data.address(), len.address());
         } catch (Throwable ex$) {
@@ -1021,10 +1043,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_new$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$11.SSL_CTX_new$MH,"SSL_CTX_new");
+        return 
RuntimeHelper.requireNonNull(constants$12.SSL_CTX_new$MH,"SSL_CTX_new");
     }
     public static MemoryAddress SSL_CTX_new ( Addressable meth) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$11.SSL_CTX_new$MH, 
"SSL_CTX_new");
+        var mh$ = RuntimeHelper.requireNonNull(constants$12.SSL_CTX_new$MH, 
"SSL_CTX_new");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(meth.address());
         } catch (Throwable ex$) {
@@ -1032,10 +1054,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_free$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$11.SSL_CTX_free$MH,"SSL_CTX_free");
+        return 
RuntimeHelper.requireNonNull(constants$12.SSL_CTX_free$MH,"SSL_CTX_free");
     }
     public static void SSL_CTX_free ( Addressable x0) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$11.SSL_CTX_free$MH, 
"SSL_CTX_free");
+        var mh$ = RuntimeHelper.requireNonNull(constants$12.SSL_CTX_free$MH, 
"SSL_CTX_free");
         try {
             mh$.invokeExact(x0.address());
         } catch (Throwable ex$) {
@@ -1087,10 +1109,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CIPHER_get_name$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$12.SSL_CIPHER_get_name$MH,"SSL_CIPHER_get_name");
+        return 
RuntimeHelper.requireNonNull(constants$13.SSL_CIPHER_get_name$MH,"SSL_CIPHER_get_name");
     }
     public static MemoryAddress SSL_CIPHER_get_name ( Addressable c) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$12.SSL_CIPHER_get_name$MH, 
"SSL_CIPHER_get_name");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$13.SSL_CIPHER_get_name$MH, 
"SSL_CIPHER_get_name");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(c.address());
         } catch (Throwable ex$) {
@@ -1098,10 +1120,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CIPHER_get_kx_nid$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$12.SSL_CIPHER_get_kx_nid$MH,"SSL_CIPHER_get_kx_nid");
+        return 
RuntimeHelper.requireNonNull(constants$13.SSL_CIPHER_get_kx_nid$MH,"SSL_CIPHER_get_kx_nid");
     }
     public static int SSL_CIPHER_get_kx_nid ( Addressable c) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$12.SSL_CIPHER_get_kx_nid$MH, 
"SSL_CIPHER_get_kx_nid");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$13.SSL_CIPHER_get_kx_nid$MH, 
"SSL_CIPHER_get_kx_nid");
         try {
             return (int)mh$.invokeExact(c.address());
         } catch (Throwable ex$) {
@@ -1153,10 +1175,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_set_verify$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$13.SSL_set_verify$MH,"SSL_set_verify");
+        return 
RuntimeHelper.requireNonNull(constants$14.SSL_set_verify$MH,"SSL_set_verify");
     }
     public static void SSL_set_verify ( Addressable s,  int mode,  Addressable 
callback) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$13.SSL_set_verify$MH, 
"SSL_set_verify");
+        var mh$ = RuntimeHelper.requireNonNull(constants$14.SSL_set_verify$MH, 
"SSL_set_verify");
         try {
             mh$.invokeExact(s.address(), mode, callback.address());
         } catch (Throwable ex$) {
@@ -1164,10 +1186,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_use_certificate_chain_file$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$13.SSL_CTX_use_certificate_chain_file$MH,"SSL_CTX_use_certificate_chain_file");
+        return 
RuntimeHelper.requireNonNull(constants$14.SSL_CTX_use_certificate_chain_file$MH,"SSL_CTX_use_certificate_chain_file");
     }
     public static int SSL_CTX_use_certificate_chain_file ( Addressable ctx,  
Addressable file) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$13.SSL_CTX_use_certificate_chain_file$MH,
 "SSL_CTX_use_certificate_chain_file");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$14.SSL_CTX_use_certificate_chain_file$MH,
 "SSL_CTX_use_certificate_chain_file");
         try {
             return (int)mh$.invokeExact(ctx.address(), file.address());
         } catch (Throwable ex$) {
@@ -1219,10 +1241,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get_peer_certificate$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$14.SSL_get_peer_certificate$MH,"SSL_get_peer_certificate");
+        return 
RuntimeHelper.requireNonNull(constants$15.SSL_get_peer_certificate$MH,"SSL_get_peer_certificate");
     }
     public static MemoryAddress SSL_get_peer_certificate ( Addressable s) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$14.SSL_get_peer_certificate$MH, 
"SSL_get_peer_certificate");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$15.SSL_get_peer_certificate$MH, 
"SSL_get_peer_certificate");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(s.address());
         } catch (Throwable ex$) {
@@ -1230,10 +1252,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get_peer_cert_chain$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$14.SSL_get_peer_cert_chain$MH,"SSL_get_peer_cert_chain");
+        return 
RuntimeHelper.requireNonNull(constants$15.SSL_get_peer_cert_chain$MH,"SSL_get_peer_cert_chain");
     }
     public static MemoryAddress SSL_get_peer_cert_chain ( Addressable s) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$14.SSL_get_peer_cert_chain$MH, 
"SSL_get_peer_cert_chain");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$15.SSL_get_peer_cert_chain$MH, 
"SSL_get_peer_cert_chain");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(s.address());
         } catch (Throwable ex$) {
@@ -1263,10 +1285,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_use_PrivateKey$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$15.SSL_CTX_use_PrivateKey$MH,"SSL_CTX_use_PrivateKey");
+        return 
RuntimeHelper.requireNonNull(constants$16.SSL_CTX_use_PrivateKey$MH,"SSL_CTX_use_PrivateKey");
     }
     public static int SSL_CTX_use_PrivateKey ( Addressable ctx,  Addressable 
pkey) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$15.SSL_CTX_use_PrivateKey$MH, 
"SSL_CTX_use_PrivateKey");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$16.SSL_CTX_use_PrivateKey$MH, 
"SSL_CTX_use_PrivateKey");
         try {
             return (int)mh$.invokeExact(ctx.address(), pkey.address());
         } catch (Throwable ex$) {
@@ -1274,10 +1296,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_use_certificate$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$15.SSL_CTX_use_certificate$MH,"SSL_CTX_use_certificate");
+        return 
RuntimeHelper.requireNonNull(constants$16.SSL_CTX_use_certificate$MH,"SSL_CTX_use_certificate");
     }
     public static int SSL_CTX_use_certificate ( Addressable ctx,  Addressable 
x) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$15.SSL_CTX_use_certificate$MH, 
"SSL_CTX_use_certificate");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$16.SSL_CTX_use_certificate$MH, 
"SSL_CTX_use_certificate");
         try {
             return (int)mh$.invokeExact(ctx.address(), x.address());
         } catch (Throwable ex$) {
@@ -1329,10 +1351,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_free$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$16.SSL_free$MH,"SSL_free");
+        return 
RuntimeHelper.requireNonNull(constants$17.SSL_free$MH,"SSL_free");
     }
     public static void SSL_free ( Addressable ssl) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$16.SSL_free$MH, 
"SSL_free");
+        var mh$ = RuntimeHelper.requireNonNull(constants$17.SSL_free$MH, 
"SSL_free");
         try {
             mh$.invokeExact(ssl.address());
         } catch (Throwable ex$) {
@@ -1340,10 +1362,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_read$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$16.SSL_read$MH,"SSL_read");
+        return 
RuntimeHelper.requireNonNull(constants$17.SSL_read$MH,"SSL_read");
     }
     public static int SSL_read ( Addressable ssl,  Addressable buf,  int num) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$16.SSL_read$MH, 
"SSL_read");
+        var mh$ = RuntimeHelper.requireNonNull(constants$17.SSL_read$MH, 
"SSL_read");
         try {
             return (int)mh$.invokeExact(ssl.address(), buf.address(), num);
         } catch (Throwable ex$) {
@@ -1395,10 +1417,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get_ciphers$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$17.SSL_get_ciphers$MH,"SSL_get_ciphers");
+        return 
RuntimeHelper.requireNonNull(constants$18.SSL_get_ciphers$MH,"SSL_get_ciphers");
     }
     public static MemoryAddress SSL_get_ciphers ( Addressable s) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$17.SSL_get_ciphers$MH, 
"SSL_get_ciphers");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$18.SSL_get_ciphers$MH, 
"SSL_get_ciphers");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(s.address());
         } catch (Throwable ex$) {
@@ -1406,10 +1428,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_get_ciphers$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$17.SSL_CTX_get_ciphers$MH,"SSL_CTX_get_ciphers");
+        return 
RuntimeHelper.requireNonNull(constants$18.SSL_CTX_get_ciphers$MH,"SSL_CTX_get_ciphers");
     }
     public static MemoryAddress SSL_CTX_get_ciphers ( Addressable ctx) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$17.SSL_CTX_get_ciphers$MH, 
"SSL_CTX_get_ciphers");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$18.SSL_CTX_get_ciphers$MH, 
"SSL_CTX_get_ciphers");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(ctx.address());
         } catch (Throwable ex$) {
@@ -1461,10 +1483,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_verify_client_post_handshake$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$18.SSL_verify_client_post_handshake$MH,"SSL_verify_client_post_handshake");
+        return 
RuntimeHelper.requireNonNull(constants$19.SSL_verify_client_post_handshake$MH,"SSL_verify_client_post_handshake");
     }
     public static int SSL_verify_client_post_handshake ( Addressable s) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$18.SSL_verify_client_post_handshake$MH, 
"SSL_verify_client_post_handshake");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$19.SSL_verify_client_post_handshake$MH, 
"SSL_verify_client_post_handshake");
         try {
             return (int)mh$.invokeExact(s.address());
         } catch (Throwable ex$) {
@@ -1472,10 +1494,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_set_client_CA_list$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$18.SSL_CTX_set_client_CA_list$MH,"SSL_CTX_set_client_CA_list");
+        return 
RuntimeHelper.requireNonNull(constants$19.SSL_CTX_set_client_CA_list$MH,"SSL_CTX_set_client_CA_list");
     }
     public static void SSL_CTX_set_client_CA_list ( Addressable ctx,  
Addressable name_list) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$18.SSL_CTX_set_client_CA_list$MH, 
"SSL_CTX_set_client_CA_list");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$19.SSL_CTX_set_client_CA_list$MH, 
"SSL_CTX_set_client_CA_list");
         try {
             mh$.invokeExact(ctx.address(), name_list.address());
         } catch (Throwable ex$) {
@@ -1527,10 +1549,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get_privatekey$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$19.SSL_get_privatekey$MH,"SSL_get_privatekey");
+        return 
RuntimeHelper.requireNonNull(constants$20.SSL_get_privatekey$MH,"SSL_get_privatekey");
     }
     public static MemoryAddress SSL_get_privatekey ( Addressable ssl) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$19.SSL_get_privatekey$MH, 
"SSL_get_privatekey");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$20.SSL_get_privatekey$MH, 
"SSL_get_privatekey");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(ssl.address());
         } catch (Throwable ex$) {
@@ -1538,10 +1560,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_get_shutdown$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$19.SSL_get_shutdown$MH,"SSL_get_shutdown");
+        return 
RuntimeHelper.requireNonNull(constants$20.SSL_get_shutdown$MH,"SSL_get_shutdown");
     }
     public static int SSL_get_shutdown ( Addressable ssl) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$19.SSL_get_shutdown$MH, 
"SSL_get_shutdown");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$20.SSL_get_shutdown$MH, 
"SSL_get_shutdown");
         try {
             return (int)mh$.invokeExact(ssl.address());
         } catch (Throwable ex$) {
@@ -1582,10 +1604,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_set_info_callback$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$20.SSL_set_info_callback$MH,"SSL_set_info_callback");
+        return 
RuntimeHelper.requireNonNull(constants$21.SSL_set_info_callback$MH,"SSL_set_info_callback");
     }
     public static void SSL_set_info_callback ( Addressable ssl,  Addressable 
cb) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$20.SSL_set_info_callback$MH, 
"SSL_set_info_callback");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$21.SSL_set_info_callback$MH, 
"SSL_set_info_callback");
         try {
             mh$.invokeExact(ssl.address(), cb.address());
         } catch (Throwable ex$) {
@@ -1615,10 +1637,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CTX_set_tmp_dh_callback$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$21.SSL_CTX_set_tmp_dh_callback$MH,"SSL_CTX_set_tmp_dh_callback");
+        return 
RuntimeHelper.requireNonNull(constants$22.SSL_CTX_set_tmp_dh_callback$MH,"SSL_CTX_set_tmp_dh_callback");
     }
     public static void SSL_CTX_set_tmp_dh_callback ( Addressable ctx,  
Addressable dh) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$21.SSL_CTX_set_tmp_dh_callback$MH, 
"SSL_CTX_set_tmp_dh_callback");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$22.SSL_CTX_set_tmp_dh_callback$MH, 
"SSL_CTX_set_tmp_dh_callback");
         try {
             mh$.invokeExact(ctx.address(), dh.address());
         } catch (Throwable ex$) {
@@ -1626,10 +1648,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CONF_CTX_new$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$21.SSL_CONF_CTX_new$MH,"SSL_CONF_CTX_new");
+        return 
RuntimeHelper.requireNonNull(constants$22.SSL_CONF_CTX_new$MH,"SSL_CONF_CTX_new");
     }
     public static MemoryAddress SSL_CONF_CTX_new () {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$21.SSL_CONF_CTX_new$MH, 
"SSL_CONF_CTX_new");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$22.SSL_CONF_CTX_new$MH, 
"SSL_CONF_CTX_new");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -1681,10 +1703,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CONF_cmd$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$22.SSL_CONF_cmd$MH,"SSL_CONF_cmd");
+        return 
RuntimeHelper.requireNonNull(constants$23.SSL_CONF_cmd$MH,"SSL_CONF_cmd");
     }
     public static int SSL_CONF_cmd ( Addressable cctx,  Addressable cmd,  
Addressable value) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$22.SSL_CONF_cmd$MH, 
"SSL_CONF_cmd");
+        var mh$ = RuntimeHelper.requireNonNull(constants$23.SSL_CONF_cmd$MH, 
"SSL_CONF_cmd");
         try {
             return (int)mh$.invokeExact(cctx.address(), cmd.address(), 
value.address());
         } catch (Throwable ex$) {
@@ -1692,10 +1714,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle SSL_CONF_cmd_value_type$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$22.SSL_CONF_cmd_value_type$MH,"SSL_CONF_cmd_value_type");
+        return 
RuntimeHelper.requireNonNull(constants$23.SSL_CONF_cmd_value_type$MH,"SSL_CONF_cmd_value_type");
     }
     public static int SSL_CONF_cmd_value_type ( Addressable cctx,  Addressable 
cmd) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$22.SSL_CONF_cmd_value_type$MH, 
"SSL_CONF_cmd_value_type");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$23.SSL_CONF_cmd_value_type$MH, 
"SSL_CONF_cmd_value_type");
         try {
             return (int)mh$.invokeExact(cctx.address(), cmd.address());
         } catch (Throwable ex$) {
@@ -1747,10 +1769,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle ERR_error_string$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$23.ERR_error_string$MH,"ERR_error_string");
+        return 
RuntimeHelper.requireNonNull(constants$24.ERR_error_string$MH,"ERR_error_string");
     }
     public static MemoryAddress ERR_error_string ( long e,  Addressable buf) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$23.ERR_error_string$MH, 
"ERR_error_string");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$24.ERR_error_string$MH, 
"ERR_error_string");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(e, 
buf.address());
         } catch (Throwable ex$) {
@@ -1758,10 +1780,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle PKCS12_verify_mac$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$23.PKCS12_verify_mac$MH,"PKCS12_verify_mac");
+        return 
RuntimeHelper.requireNonNull(constants$24.PKCS12_verify_mac$MH,"PKCS12_verify_mac");
     }
     public static int PKCS12_verify_mac ( Addressable p12,  Addressable pass,  
int passlen) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$23.PKCS12_verify_mac$MH, 
"PKCS12_verify_mac");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$24.PKCS12_verify_mac$MH, 
"PKCS12_verify_mac");
         try {
             return (int)mh$.invokeExact(p12.address(), pass.address(), 
passlen);
         } catch (Throwable ex$) {
@@ -1813,10 +1835,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle RAND_load_file$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$24.RAND_load_file$MH,"RAND_load_file");
+        return 
RuntimeHelper.requireNonNull(constants$25.RAND_load_file$MH,"RAND_load_file");
     }
     public static int RAND_load_file ( Addressable file,  long max_bytes) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$24.RAND_load_file$MH, 
"RAND_load_file");
+        var mh$ = RuntimeHelper.requireNonNull(constants$25.RAND_load_file$MH, 
"RAND_load_file");
         try {
             return (int)mh$.invokeExact(file.address(), max_bytes);
         } catch (Throwable ex$) {
@@ -1824,10 +1846,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle X509_check_issued$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$24.X509_check_issued$MH,"X509_check_issued");
+        return 
RuntimeHelper.requireNonNull(constants$25.X509_check_issued$MH,"X509_check_issued");
     }
     public static int X509_check_issued ( Addressable issuer,  Addressable 
subject) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$24.X509_check_issued$MH, 
"X509_check_issued");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$25.X509_check_issued$MH, 
"X509_check_issued");
         try {
             return (int)mh$.invokeExact(issuer.address(), subject.address());
         } catch (Throwable ex$) {
@@ -1879,10 +1901,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle ENGINE_load_private_key$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$25.ENGINE_load_private_key$MH,"ENGINE_load_private_key");
+        return 
RuntimeHelper.requireNonNull(constants$26.ENGINE_load_private_key$MH,"ENGINE_load_private_key");
     }
     public static MemoryAddress ENGINE_load_private_key ( Addressable e,  
Addressable key_id,  Addressable ui_method,  Addressable callback_data) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$25.ENGINE_load_private_key$MH, 
"ENGINE_load_private_key");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$26.ENGINE_load_private_key$MH, 
"ENGINE_load_private_key");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(e.address(), 
key_id.address(), ui_method.address(), callback_data.address());
         } catch (Throwable ex$) {
@@ -1890,10 +1912,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle ENGINE_set_default$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$25.ENGINE_set_default$MH,"ENGINE_set_default");
+        return 
RuntimeHelper.requireNonNull(constants$26.ENGINE_set_default$MH,"ENGINE_set_default");
     }
     public static int ENGINE_set_default ( Addressable e,  int flags) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$25.ENGINE_set_default$MH, 
"ENGINE_set_default");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$26.ENGINE_set_default$MH, 
"ENGINE_set_default");
         try {
             return (int)mh$.invokeExact(e.address(), flags);
         } catch (Throwable ex$) {
@@ -1945,10 +1967,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle OCSP_resp_get0$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$26.OCSP_resp_get0$MH,"OCSP_resp_get0");
+        return 
RuntimeHelper.requireNonNull(constants$27.OCSP_resp_get0$MH,"OCSP_resp_get0");
     }
     public static MemoryAddress OCSP_resp_get0 ( Addressable bs,  int idx) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$26.OCSP_resp_get0$MH, 
"OCSP_resp_get0");
+        var mh$ = RuntimeHelper.requireNonNull(constants$27.OCSP_resp_get0$MH, 
"OCSP_resp_get0");
         try {
             return 
(jdk.incubator.foreign.MemoryAddress)mh$.invokeExact(bs.address(), idx);
         } catch (Throwable ex$) {
@@ -1956,10 +1978,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle OCSP_resp_find$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$26.OCSP_resp_find$MH,"OCSP_resp_find");
+        return 
RuntimeHelper.requireNonNull(constants$27.OCSP_resp_find$MH,"OCSP_resp_find");
     }
     public static int OCSP_resp_find ( Addressable bs,  Addressable id,  int 
last) {
-        var mh$ = RuntimeHelper.requireNonNull(constants$26.OCSP_resp_find$MH, 
"OCSP_resp_find");
+        var mh$ = RuntimeHelper.requireNonNull(constants$27.OCSP_resp_find$MH, 
"OCSP_resp_find");
         try {
             return (int)mh$.invokeExact(bs.address(), id.address(), last);
         } catch (Throwable ex$) {
@@ -2011,10 +2033,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle OCSP_CERTID_free$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$27.OCSP_CERTID_free$MH,"OCSP_CERTID_free");
+        return 
RuntimeHelper.requireNonNull(constants$28.OCSP_CERTID_free$MH,"OCSP_CERTID_free");
     }
     public static void OCSP_CERTID_free ( Addressable a) {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$27.OCSP_CERTID_free$MH, 
"OCSP_CERTID_free");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$28.OCSP_CERTID_free$MH, 
"OCSP_CERTID_free");
         try {
             mh$.invokeExact(a.address());
         } catch (Throwable ex$) {
@@ -2022,10 +2044,10 @@ public class openssl_h  {
         }
     }
     public static MethodHandle OCSP_REQUEST_new$MH() {
-        return 
RuntimeHelper.requireNonNull(constants$27.OCSP_REQUEST_new$MH,"OCSP_REQUEST_new");
+        return 
RuntimeHelper.requireNonNull(constants$28.OCSP_REQUEST_new$MH,"OCSP_REQUEST_new");
     }
     public static MemoryAddress OCSP_REQUEST_new () {
-        var mh$ = 
RuntimeHelper.requireNonNull(constants$27.OCSP_REQUEST_new$MH, 
"OCSP_REQUEST_new");
+        var mh$ = 
RuntimeHelper.requireNonNull(constants$28.OCSP_REQUEST_new$MH, 
"OCSP_REQUEST_new");
         try {
             return (jdk.incubator.foreign.MemoryAddress)mh$.invokeExact();
         } catch (Throwable ex$) {
@@ -2054,18 +2076,6 @@ public class openssl_h  {
             throw new AssertionError("should not reach here", ex$);
         }
     }
-    public static long OPENSSL_VERSION_NUMBER() {
-        return 269488335L;
-    }
-    public static MemorySegment OPENSSL_VERSION_TEXT() {
-        return constants$28.OPENSSL_VERSION_TEXT$SEGMENT;
-    }
-    public static MemorySegment SHLIB_VERSION_HISTORY() {
-        return constants$28.SHLIB_VERSION_HISTORY$SEGMENT;
-    }
-    public static MemorySegment SHLIB_VERSION_NUMBER() {
-        return constants$28.SHLIB_VERSION_NUMBER$SEGMENT;
-    }
     public static MemorySegment OPENSSL_FILE() {
         return constants$28.OPENSSL_FILE$SEGMENT;
     }
@@ -2087,21 +2097,6 @@ public class openssl_h  {
     public static int EVP_PKEY_DSA() {
         return (int)116L;
     }
-    public static MemorySegment SSL_TXT_DSS() {
-        return constants$29.SSL_TXT_DSS$SEGMENT;
-    }
-    public static MemorySegment SSL_TXT_DH() {
-        return constants$29.SSL_TXT_DH$SEGMENT;
-    }
-    public static MemorySegment SSL_TXT_RSA() {
-        return constants$29.SSL_TXT_RSA$SEGMENT;
-    }
-    public static MemorySegment SSL_TXT_ECDH() {
-        return constants$29.SSL_TXT_ECDH$SEGMENT;
-    }
-    public static MemorySegment SSL_TXT_ECDSA() {
-        return constants$29.SSL_TXT_ECDSA$SEGMENT;
-    }
     public static int SSL_OP_NO_TICKET() {
         return (int)16384L;
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to