Skip to content

Commit

Permalink
Fix unit tests with libressl 2.2.7
Browse files Browse the repository at this point in the history
OPENSSL_VERSION_NUMBER in libressl 2.2.7 is 20000000, which is >=
0x10100000L.
  • Loading branch information
sonertari committed Nov 15, 2021
1 parent 923bea1 commit 7654f5e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/check/opts.t.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ static char *argv14[] = {
#define NATENGINE "pf"
#endif

#if OPENSSL_VERSION_NUMBER >= 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040100fL)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3040100fL)
#ifdef HAVE_TLSV13
#define SSL_PROTO_CONFIG_PROXYSPEC "tls13 -tls13>=tls11<=tls12|no sslcomp|no_tls13"
#define SSL_PROTO_CONFIG_FILTERRULE "tls13 -tls13>=tls10<=tls11|no_tls13"
#else
#else // openssl-1.1.0l = 101000cf
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10>=tls11<=tls12|no sslcomp|no_tls10"
#define SSL_PROTO_CONFIG_FILTERRULE "tls12>=tls10<=tls11"
#endif /* HAVE_TLSV13 */
Expand All @@ -111,7 +111,7 @@ static char *argv14[] = {
#elif (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20702000L)
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10>=tls11<=tls12|no sslcomp|no_tls10"
#define SSL_PROTO_CONFIG_FILTERRULE "tls12>=tls10<=tls11"
#else
#else // openssl-1.0.2g = 1000207f, libressl 2.2.7 = 20000000|20020006
#define SSL_PROTO_CONFIG_PROXYSPEC "tls12 -tls10|no sslcomp|no_tls10"
#define SSL_PROTO_CONFIG_FILTERRULE "tls12"
#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
Expand Down

0 comments on commit 7654f5e

Please sign in to comment.