This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fc900565a0 Update to the new API
fc900565a0 is described below
commit fc900565a0df3f2375436b50efba19a62ca93bcd
Author: remm <[email protected]>
AuthorDate: Thu Nov 9 23:00:43 2023 +0100
Update to the new API
---
modules/openssl-foreign/pom.xml | 2 +-
.../org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/openssl-foreign/pom.xml b/modules/openssl-foreign/pom.xml
index ce92d85e8d..cc0a8ba2d6 100644
--- a/modules/openssl-foreign/pom.xml
+++ b/modules/openssl-foreign/pom.xml
@@ -31,7 +31,7 @@
<version>0.1-SNAPSHOT</version>
<properties>
- <tomcat.version>9.0.80</tomcat.version>
+ <tomcat.version>9.0.83</tomcat.version>
<project.build.outputTimestamp>2021-12-02T12:00:00Z</project.build.outputTimestamp>
</properties>
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 2168196575..538ff2ae83 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -981,9 +981,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
if (keyPass == null) {
keyPass = certificate.getCertificateKeystorePassword();
}
- String keyPassFile = null;//FIXME Tomcat
9.0.83:certificate.getCertificateKeyPasswordFile();
+ String keyPassFile = certificate.getCertificateKeyPasswordFile();
if (keyPassFile == null) {
- keyPassFile = null;//FIXME Tomcat
9.0.83:certificate.getCertificateKeystorePasswordFile();
+ keyPassFile = certificate.getCertificateKeystorePasswordFile();
}
if (keyPassFile != null) {
try (BufferedReader reader =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
