mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: ssl: next round of build warnings on LIBRESSL_VERSION_NUMBER

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-08-30 06:10:04 +02:00
parent 18795d48a9
commit ea57a9b103
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/openssl-compat.h
View File

@ -187,7 +187,7 @@ static inline X509_CRL *X509_OBJECT_get0_X509_CRL(const X509_OBJECT *a)
} }
#endif #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 * 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 #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 #define __OPENSSL_110_CONST__ const
#else #else
#define __OPENSSL_110_CONST__ #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 #define TLSEXT_signature_ecdsa 3
#endif #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) defined(OPENSSL_IS_BORINGSSL)
#define X509_getm_notBefore X509_get_notBefore #define X509_getm_notBefore X509_get_notBefore
#define X509_getm_notAfter X509_get_notAfter #define X509_getm_notAfter X509_get_notAfter