Author: markt
Date: Thu Jul 31 17:21:05 2014
New Revision: 1614940
URL: http://svn.apache.org/r1614940
Log:
Start to expand the parser tests
Modified:
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/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=1614940&r1=1614939&r2=1614940&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 17:21:05 2014
@@ -19,11 +19,31 @@ 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 {
@Test
+ public void testENull() throws Exception {
+ testSpecification("eNULL");
+ }
+
+
+ @Test
+ public void testANull() throws Exception {
+ testSpecification("aNULL");
+ }
+
+
+ @Test
+ @Ignore("Results don't match - probably due to unimplemented ciphers")
+ public void testHigh() throws Exception {
+ testSpecification("HIGH");
+ }
+
+
+ @Test
public void testExport40() throws Exception {
testSpecification("EXPORT40");
}
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=1614940&r1=1614939&r2=1614940&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 17:21:05 2014
@@ -39,7 +39,10 @@ public class TesterOpenSSL {
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.SSL_CK_RC2_128_CBC_EXPORT40_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,
+ Cipher.SSL_FORTEZZA_DMS_WITH_RC4_128_SHA)));
static {
String versionString = null;
@@ -112,6 +115,6 @@ public class TesterOpenSSL {
ByteArrayOutputStream stdoutBytes = new ByteArrayOutputStream();
IOTools.flow(stdout, stdoutBytes);
- return stdoutBytes.toString();
+ return stdoutBytes.toString().trim();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
