Author: markt
Date: Fri Aug 7 15:57:08 2015
New Revision: 1694707
URL: http://svn.apache.org/r1694707
Log:
Oracle JVMs do support at leats some of these
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1694707&r1=1694706&r2=1694707&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Fri
Aug 7 15:57:08 2015
@@ -732,8 +732,6 @@ public enum Cipher {
),*/
/* PSK cipher suites from RFC 4785 */
- // Unsupported by Java
-
// Cipher 2C
TLS_PSK_WITH_NULL_SHA(
0x002c,
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=1694707&r1=1694706&r2=1694707&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
Fri Aug 7 15:57:08 2015
@@ -393,7 +393,6 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
- "DHE-PSK-NULL-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
@@ -405,10 +404,8 @@ public class TestCipher {
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
- "PSK-NULL-SHA+SSLv3",
"RC2-CBC-MD5+SSLv2",
- "RC4-MD5+SSLv2",
- "RSA-PSK-NULL-SHA+SSLv3")));
+ "RC4-MD5+SSLv2")));
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
