[tomcat] branch 8.5.x updated: Differentiate OpenSSL implementations

[re...@apache.org]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 1da50ee  Differentiate OpenSSL implementations
1da50ee is described below

commit 1da50ee8ba2936b2226884dc6d1da7647712c859
Author: remm <re...@apache.org>
AuthorDate: Mon Nov 8 14:19:09 2021 +0100

    Differentiate OpenSSL implementations
    
    Most importantly avoid using "jsse" for OpenSSL with Java 17.
---
 java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
index d8204a4..f8cfe05 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
@@ -38,6 +38,10 @@ public abstract class AbstractHttp11JsseProtocol<S>
         if (OpenSSLImplementation.class.getName().equals(getSslImplementationName())) {
             return "openssl";
         }
+        if (getSslImplementationName() != null
+                && getSslImplementationName().endsWith(".panama.OpenSSLImplementation")) {
+            return "openssljava17";
+        }
         return "jsse";
     }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org