Author: rjung
Date: Sat Aug 19 20:20:49 2017
New Revision: 1805524
URL: http://svn.apache.org/viewvc?rev=1805524&view=rev
Log:
AVAILABLE_CIPHER_SUITES contains the ciphers with
JSSE names, so the check needs to be done before
replacing with the OpenSSL name.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1805524&r1=1805523&r2=1805524&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Sat
Aug 19 20:20:49 2017
@@ -709,12 +709,12 @@ public final class OpenSSLEngine extends
break;
}
String converted =
OpenSSLCipherConfigurationParser.jsseToOpenSSL(cipherSuite);
- if (converted != null) {
- cipherSuite = converted;
- }
if (!AVAILABLE_CIPHER_SUITES.contains(cipherSuite)) {
logger.debug(sm.getString("engine.unsupportedCipher",
cipherSuite, converted));
}
+ if (converted != null) {
+ cipherSuite = converted;
+ }
buf.append(cipherSuite);
buf.append(':');
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
