Author: markt
Date: Tue Aug 12 18:30:23 2014
New Revision: 1617556
URL: http://svn.apache.org/r1617556
Log:
Take account of different protocol names returned by openssl ciphers -v
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1617556&r1=1617555&r2=1617556&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Aug 12 18:30:23 2014
@@ -114,7 +114,8 @@ public class TestCipher {
if (openSSLAlias.contains("RC2-MD5")) {
continue;
}
- expectedCipherSuites.add(openSSLAlias + "+" +
cipher.getProtocol());
+ expectedCipherSuites.add(openSSLAlias + "+" +
+ cipher.getProtocol().getOpenSSLName());
}
Set<String> unavailableCipherSuites = new HashSet<>();
@@ -136,7 +137,6 @@ public class TestCipher {
unexpectedList.append(' ');
}
Assert.assertEquals(unexpectedList.toString(), 0,
unexpectedCipherSuites.size());
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
