Author: markt
Date: Wed Apr 12 09:22:09 2017
New Revision: 1791096
URL: http://svn.apache.org/viewvc?rev=1791096&view=rev
Log:
Follow-up to r1791095
Need to update OpenSSL names for ciphers that are not supported by IBM JREs
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1791096&r1=1791095&r2=1791096&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Wed Apr 12 09:22:09 2017
@@ -646,14 +646,14 @@ public class TestCipher {
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CHACHA20-POLY1305+TLSv1.2",
"ECDHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
- "ECDHE-PSK-AES128-CBC-SHA+SSLv3",
+ "ECDHE-PSK-AES128-CBC-SHA+TLSv1",
"ECDHE-PSK-AES128-CBC-SHA256+TLSv1",
- "ECDHE-PSK-AES256-CBC-SHA+SSLv3",
+ "ECDHE-PSK-AES256-CBC-SHA+TLSv1",
"ECDHE-PSK-AES256-CBC-SHA384+TLSv1",
"ECDHE-PSK-CAMELLIA128-SHA256+TLSv1",
"ECDHE-PSK-CAMELLIA256-SHA384+TLSv1",
"ECDHE-PSK-CHACHA20-POLY1305+TLSv1.2",
- "ECDHE-PSK-NULL-SHA+SSLv3",
+ "ECDHE-PSK-NULL-SHA+TLSv1",
"ECDHE-PSK-NULL-SHA256+TLSv1",
"ECDHE-PSK-NULL-SHA384+TLSv1",
"ECDHE-PSK-RC4-SHA+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
