Author: markt
Date: Mon Sep 28 10:16:25 2015
New Revision: 1705647
URL: http://svn.apache.org/viewvc?rev=1705647&view=rev
Log:
Add the new ciphers to the list that was added in OpenSSL 1.1.0
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1705647&r1=1705646&r2=1705647&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Mon Sep 28 10:16:25 2015
@@ -270,6 +270,26 @@ public class TesterOpenSSL {
unimplemented.add(Cipher.TLS_PSK_WITH_AES_128_GCM_SHA256);
unimplemented.add(Cipher.TLS_PSK_WITH_AES_256_GCM_SHA384);
unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256);
+ unimplemented.add(Cipher.TLS_RSA_WITH_AES_128_CCM);
+ unimplemented.add(Cipher.TLS_RSA_WITH_AES_256_CCM);
+ unimplemented.add(Cipher.TLS_DHE_RSA_WITH_AES_128_CCM);
+ unimplemented.add(Cipher.TLS_DHE_RSA_WITH_AES_256_CCM);
+ unimplemented.add(Cipher.TLS_RSA_WITH_AES_128_CCM_8);
+ unimplemented.add(Cipher.TLS_RSA_WITH_AES_256_CCM_8);
+ unimplemented.add(Cipher.TLS_DHE_RSA_WITH_AES_128_CCM_8);
+ unimplemented.add(Cipher.TLS_DHE_RSA_WITH_AES_256_CCM_8);
+ unimplemented.add(Cipher.TLS_PSK_WITH_AES_128_CCM);
+ unimplemented.add(Cipher.TLS_PSK_WITH_AES_256_CCM);
+ unimplemented.add(Cipher.TLS_DHE_PSK_WITH_AES_128_CCM);
+ unimplemented.add(Cipher.TLS_DHE_PSK_WITH_AES_256_CCM);
+ unimplemented.add(Cipher.TLS_PSK_WITH_AES_128_CCM_8);
+ unimplemented.add(Cipher.TLS_PSK_WITH_AES_256_CCM_8);
+ unimplemented.add(Cipher.TLS_PSK_DHE_WITH_AES_128_CCM_8);
+ unimplemented.add(Cipher.TLS_PSK_DHE_WITH_AES_256_CCM_8);
+ unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_128_CCM);
+ unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CCM);
+ unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8);
+ unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8);
} else {
// These were removed in 1.1.0 so won't be available from that
// version onwards.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
