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 5952cf23a1 Add OPENSSL_free macro
5952cf23a1 is described below
commit 5952cf23a1209fc0e79bce833b86b7704992b050
Author: remm <[email protected]>
AuthorDate: Fri Oct 20 14:36:53 2023 +0200
Add OPENSSL_free macro
---
.../apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 5 +++--
.../java/org/apache/tomcat/util/openssl/openssl_h_Macros.java | 10 ++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index a4af1edc5f..4ef4f41c12 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -59,6 +59,7 @@ import javax.net.ssl.SSLSessionContext;
import static org.apache.tomcat.util.openssl.openssl_h.*;
import static org.apache.tomcat.util.openssl.openssl_h_Compatibility.*;
+import static org.apache.tomcat.util.openssl.openssl_h_Macros.*;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.Asn1Parser;
@@ -873,7 +874,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
MemorySegment buf = bufPointer.get(ValueLayout.ADDRESS, 0);
byte[] certificate = buf.reinterpret(length, localArena,
null).toArray(ValueLayout.JAVA_BYTE);
X509_free(x509);
- CRYPTO_free(buf, MemorySegment.NULL, 0); // OPENSSL_free macro
+ OPENSSL_free(buf);
return certificate;
}
}
@@ -897,7 +898,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
MemorySegment buf = bufPointer.get(ValueLayout.ADDRESS, 0);
byte[] certificate = buf.reinterpret(length, localArena,
null).toArray(ValueLayout.JAVA_BYTE);
certificateChain[i] = certificate;
- CRYPTO_free(buf, MemorySegment.NULL, 0); // OPENSSL_free macro
+ OPENSSL_free(buf);
}
return certificateChain;
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
index 5d11bdf628..3937d58f59 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h_Macros.java
@@ -170,6 +170,16 @@ public class openssl_h_Macros {
}
+ /**
+ * Free memory.
+ * # define OPENSSL_free(addr) \
+ * CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE)
+ */
+ public static void OPENSSL_free(MemorySegment segment) {
+ CRYPTO_free(segment, MemorySegment.NULL, 0);
+ }
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
