Author: rjung
Date: Sun Feb 15 19:15:44 2015
New Revision: 1659983
URL: http://svn.apache.org/r1659983
Log:
Allow to overwrite expected OpenSSL test version
with ant property "test.openssl.version".
Update default for trunk to 1.1.0 (OpenSSL master).
We'll see, which tests fail.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1659983&r1=1659982&r2=1659983&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Feb 15 19:15:44 2015
@@ -183,6 +183,10 @@
<!-- Location of OpenSSL binary (file name, not directory) -->
<property name="test.openssl.path" value="" />
+ <!-- Accepted version of OpenSSL. The output of "openssl version"
+ must start with "OpenSSL " plus value of this property. -->
+ <property name="test.openssl.version" value="1.1.0" />
+
<!-- Include .gitignore in src distributions. -->
<!-- .git and .gitignore are in defaultexcludes since Ant 1.8.2 -->
<defaultexcludes add="**/.git" />
@@ -1443,6 +1447,7 @@
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />
<sysproperty key="tomcat.test.reports" value="${test.reports}" />
<sysproperty key="tomcat.test.openssl.path"
value="${test.openssl.path}" />
+ <sysproperty key="tomcat.test.openssl.version"
value="${test.openssl.version}" />
<sysproperty key="tomcat.test.relaxTiming" value="${test.relaxTiming}"
/>
<!-- File for Cobertura to write coverage results to -->
<sysproperty key="net.sourceforge.cobertura.datafile"
file="${cobertura.datafile}" />
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=1659983&r1=1659982&r2=1659983&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
Sun Feb 15 19:15:44 2015
@@ -30,7 +30,6 @@ import org.apache.tomcat.util.http.fileu
public class TesterOpenSSL {
- public static final String EXPECTED_VERSION = "1.0.1j";
public static final boolean IS_EXPECTED_VERSION;
public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS =
@@ -72,13 +71,14 @@ public class TesterOpenSSL {
Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5)));
static {
+ String expected_version =
System.getProperty("tomcat.test.openssl.version", "");
String versionString = null;
try {
versionString = executeOpenSSLCommand("version");
} catch (IOException e) {
versionString = "";
}
- IS_EXPECTED_VERSION = versionString.contains(EXPECTED_VERSION);
+ IS_EXPECTED_VERSION = versionString.startsWith("OpenSSL " +
expected_version);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
