Skip to content

Commit 7654f5e

Browse files
committed
Fix unit tests with libressl 2.2.7
OPENSSL_VERSION_NUMBER in libressl 2.2.7 is 20000000, which is >= 0x10100000L.
1 parent 923bea1 commit 7654f5e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/check/opts.t.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ static char *argv14[] = {
9494
#define NATENGINE "pf"
9595
#endif
9696

97-
#if OPENSSL_VERSION_NUMBER >= 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040100fL)
97+
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040100fL)
9898
#ifdef HAVE_TLSV13
9999
#define SSL_PROTO_CONFIG_PROXYSPEC "tls13 -tls13>=tls11<=tls12|no sslcomp|no_tls13"
100100
#define SSL_PROTO_CONFIG_FILTERRULE "tls13 -tls13>=tls10<=tls11|no_tls13"
101-
#else
101+
#else // openssl-1.1.0l = 101000cf
102102
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10>=tls11<=tls12|no sslcomp|no_tls10"
103103
#define SSL_PROTO_CONFIG_FILTERRULE "tls12>=tls10<=tls11"
104104
#endif /* HAVE_TLSV13 */
@@ -111,7 +111,7 @@ static char *argv14[] = {
111111
#elif (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20702000L)
112112
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10>=tls11<=tls12|no sslcomp|no_tls10"
113113
#define SSL_PROTO_CONFIG_FILTERRULE "tls12>=tls10<=tls11"
114-
#else
114+
#else // openssl-1.0.2g = 1000207f, libressl 2.2.7 = 20000000|20020006
115115
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10|no sslcomp|no_tls10"
116116
#define SSL_PROTO_CONFIG_FILTERRULE "tls12"
117117
#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */

0 commit comments

Comments
 (0)