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 6ed0eef542 Add missing deprecation
6ed0eef542 is described below
commit 6ed0eef5426c9991b9ffd25303c7ce750e48ced5
Author: remm <[email protected]>
AuthorDate: Mon Sep 4 11:26:34 2023 +0200
Add missing deprecation
---
.../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java | 3 ++-
.../src/main/java/org/apache/tomcat/util/openssl/openssl_h.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index ba3a1007ff..5acc053016 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -85,7 +85,8 @@ public class OpenSSLLibrary {
if (OpenSSLStatus.isLibraryInitialized()) {
return;
}
- OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN(),
MemorySegment.NULL);
+ long initParam = (OpenSSL_version_num() >= 0x3000000fL) ? 0 :
OPENSSL_INIT_ENGINE_ALL_BUILTIN();
+ OPENSSL_init_ssl(initParam, MemorySegment.NULL);
OpenSSLStatus.setLibraryInitialized(true);
}
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
index fc5ad10d81..0fde0bf82d 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -3429,6 +3429,7 @@ public class openssl_h {
* #define OPENSSL_INIT_ENGINE_ALL_BUILTIN 30208
* }
*/
+ @Deprecated
public static long OPENSSL_INIT_ENGINE_ALL_BUILTIN() {
return 30208L;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
