mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: ssl: openssl-compat: Fix getm_ defines

Browse Source 
LIBRESSL_VERSION_NUMBER evaluates to 0 under OpenSSL, making the condition
always true. Check for the define before checking it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

[wt: to be backported as far as 1.9]
This commit is contained in:
Rosen Penev 2019-12-19 12:54:13 -08:00 committed by Willy Tarreau
parent 8c4c1d4299
commit b3814c2ca8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common/openssl-compat.h
View File

@ -278,7 +278,8 @@ static inline void EVP_PKEY_up_ref(EVP_PKEY *pkey)
#define TLSEXT_signature_ecdsa 3 #define TLSEXT_signature_ecdsa 3
#endif #endif
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) #if ((HA_OPENSSL_VERSION_NUMBER < 0x1010000fL) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL)) ||\
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
#endif #endif