Author: markt
Date: Thu Jul 31 19:16:50 2014
New Revision: 1614962
URL: http://svn.apache.org/r1614962
Log:
Further expansion of the parser tests
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.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=1614962&r1=1614961&r2=1614962&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 Thu
Jul 31 19:16:50 2014
@@ -2415,6 +2415,9 @@ enum Cipher {
256
),
// RC4_128_WITH_MD5
+ /*
+ * Same as Cipher 04 and name isn't recognised by JSSE so ignore this as it
+ * adds no value and complicates the unit tests.
SSL_CK_RC4_128_WITH_MD5(
"RC4-MD5",
null,
@@ -2428,7 +2431,7 @@ enum Cipher {
false,
128,
128
- ),
+ ),*/
// RC2_128_CBC_WITH_MD5
SSL_CK_RC2_128_CBC_WITH_MD5(
"RC2-MD5",
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java?rev=1614962&r1=1614961&r2=1614962&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestOpenSSLCipherConfigurationParser.java
Thu Jul 31 19:16:50 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.net.jsse.
import java.util.List;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class TestOpenSSLCipherConfigurationParser {
@@ -37,13 +36,24 @@ public class TestOpenSSLCipherConfigurat
@Test
- @Ignore("Results don't match - probably due to unimplemented ciphers")
public void testHigh() throws Exception {
testSpecification("HIGH");
}
@Test
+ public void testMedium() throws Exception {
+ testSpecification("MEDIUM");
+ }
+
+
+ @Test
+ public void testLow() throws Exception {
+ testSpecification("LOW");
+ }
+
+
+ @Test
public void testExport40() throws Exception {
testSpecification("EXPORT40");
}
@@ -60,6 +70,16 @@ public class TestOpenSSLCipherConfigurat
TesterOpenSSL.removeUnimplementedCiphersJsse(jsseCipherListFromParser);
- Assert.assertEquals(jsseCipherListFromOpenSSL,
jsseCipherListFromParser);
+ Assert.assertEquals(listToString(jsseCipherListFromOpenSSL),
listToString(jsseCipherListFromParser));
+ }
+
+
+ private String listToString(List<String> list) {
+ StringBuilder sb = new StringBuilder();
+ for (String entry : list) {
+ sb.append(entry);
+ sb.append(',');
+ }
+ return sb.toString();
}
}
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=1614962&r1=1614961&r2=1614962&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
Thu Jul 31 19:16:50 2014
@@ -37,8 +37,32 @@ public class TesterOpenSSL {
public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
- Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
+ Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384,
+ Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
+ Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256,
+ Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256,
+ Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA,
+ Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
+ Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256,
+ Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256,
+ Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256,
+ Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
+ Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
+ Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA,
+ Cipher.TLS_DH_RSA_WITH_DES_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_DES_CBC_SHA,
+ Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA,
+ Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA,
+ Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA,
+ Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
Cipher.SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5,
Cipher.SSL_FORTEZZA_DMS_WITH_NULL_SHA,
Cipher.SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
