Author: markt Date: Tue Jan 5 16:30:38 2016 New Revision: 1723115 URL: http://svn.apache.org/viewvc?rev=1723115&view=rev Log: Some OpenSSL aliases use EDH instead of DHE. Fixes 6 failures.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723115&r1=1723114&r2=1723115&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java Tue Jan 5 16:30:38 2016 @@ -364,6 +364,7 @@ public final class CipherSuiteConverter handshakeAlgo = "ECDH_anon"; } + handshakeAlgo = handshakeAlgo.replace("EDH", "DHE"); handshakeAlgo = handshakeAlgo.replace('-', '_'); if (export) { return handshakeAlgo + "_EXPORT"; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org