Author: markt
Date: Wed Sep 12 08:25:20 2018
New Revision: 1840634
URL: http://svn.apache.org/viewvc?rev=1840634&view=rev
Log:
OpenSSL master has bumped version number. Need to take account of this in
version detection used in unit tests.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1840634&r1=1840633&r2=1840634&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Wed Sep 12 08:25:20 2018
@@ -48,9 +48,13 @@ public class TesterOpenSSL {
} catch (IOException e) {
versionString = "";
}
- if (versionString.startsWith("OpenSSL 1.1.1")) {
+ if (versionString.startsWith("OpenSSL 1.1.2")) {
// Note: Gump currently tests 9.0.x with OpenSSL master
- // (a.k.a 1.1.1-dev)
+ // (a.k.a 1.1.2-dev)
+ VERSION = 10102;
+ } else if (versionString.startsWith("OpenSSL 1.1.1")) {
+ // LTS
+ // Supported until at least 2023-09-11
VERSION = 10101;
} else if (versionString.startsWith("OpenSSL 1.1.0")) {
// Support ends 2018-04-30
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
