diff options
| author | Willy Tarreau <w@1wt.eu> | 2021-08-30 06:10:04 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2021-08-30 06:20:46 +0200 |
| commit | ea57a9b103f8a9e8e7a5d0cc5b03fa8ba59543a8 (patch) | |
| tree | ebcabb392da0c97c6c1cf0ec8c463e6061185d11 | |
| parent | 18795d48a9bb09aedc57e547029828a56322e49d (diff) | |
| download | haproxy-ea57a9b103f8a9e8e7a5d0cc5b03fa8ba59543a8.tar.gz | |
BUILD: ssl: next round of build warnings on LIBRESSL_VERSION_NUMBER
Other build warnings were emitted on LIBRESSL_VERSION_NUMBER with -Wundef
under openssl < 1.1. Related to GH issue #1369. Seems like some of them
could be simplified a little bit.
| -rw-r--r-- | include/haproxy/openssl-compat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h index 95d924d65..17d073d51 100644 --- a/include/haproxy/openssl-compat.h +++ b/include/haproxy/openssl-compat.h @@ -187,7 +187,7 @@ static inline X509_CRL *X509_OBJECT_get0_X509_CRL(const X509_OBJECT *a) } #endif -#if (HA_OPENSSL_VERSION_NUMBER < 0x1010000fL) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL) +#if (HA_OPENSSL_VERSION_NUMBER < 0x1010000fL) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) /* * Functions introduced in OpenSSL 1.1.0 and in LibreSSL 2.7.0 */ @@ -298,7 +298,7 @@ static inline X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) } #endif -#if (HA_OPENSSL_VERSION_NUMBER >= 0x1010000fL) || (LIBRESSL_VERSION_NUMBER >= 0x2070200fL) +#if (HA_OPENSSL_VERSION_NUMBER >= 0x1010000fL) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070200fL) #define __OPENSSL_110_CONST__ const #else #define __OPENSSL_110_CONST__ @@ -334,7 +334,7 @@ static inline X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx) #define TLSEXT_signature_ecdsa 3 #endif -#if ((HA_OPENSSL_VERSION_NUMBER < 0x1010000fL) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL)) ||\ +#if ((HA_OPENSSL_VERSION_NUMBER < 0x1010000fL) && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)) ||\ defined(OPENSSL_IS_BORINGSSL) #define X509_getm_notBefore X509_get_notBefore #define X509_getm_notAfter X509_get_notAfter |