(tomcat) branch 10.1.x updated: Switch to the future API (and version number)

[remm]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new d118ff2fa7 Switch to the future API (and version number)
d118ff2fa7 is described below

commit d118ff2fa7a20a15273eda094046c82a13cb347c
Author: remm <r...@apache.org>
AuthorDate: Thu Nov 9 22:58:38 2023 +0100

    Switch to the future API (and version number)
---
 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..9d4b7a211d 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>10.1.16</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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org