(tomcat) branch main updated: Use the new APIs

[remm]

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 f6aad024dd Use the new APIs
f6aad024dd is described below

commit f6aad024dd7d53b047280a3a705fd8a6f04e3bba
Author: remm <r...@apache.org>
AuthorDate: Mon Nov 13 16:58:29 2023 +0100

    Use the new APIs
---
 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..ceff9de1cd 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>11.0.0-M14</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 d15b56ab0c..451970da18 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
@@ -980,9 +980,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org