From: Ilya Shipitsin Date: Mon, 31 Jan 2022 04:45:00 +0000 (+0500) Subject: BUILD: ssl: adjust guard for X509_get_X509_PUBKEY(x) X-Git-Tag: v2.6-dev2~203 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5ea76a3df25d7de5ead80cf246db8a7e66ee339;p=thirdparty%2Fhaproxy.git BUILD: ssl: adjust guard for X509_get_X509_PUBKEY(x) BoringSSL defines that function since https://boringssl.googlesource.com/boringssl/+/33f8d33af0dcb083610e978baad5a8b6e1cfee82 --- diff --git a/include/haproxy/openssl-compat.h b/include/haproxy/openssl-compat.h index 123b76ede1..d34a22efcd 100644 --- a/include/haproxy/openssl-compat.h +++ b/include/haproxy/openssl-compat.h @@ -119,7 +119,7 @@ static inline void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, const void #endif // OpenSSL < 0.9.8 -#if (((HA_OPENSSL_VERSION_NUMBER < 0x1000000fL) || defined(OPENSSL_IS_BORINGSSL)) && !defined(X509_get_X509_PUBKEY)) +#if ((HA_OPENSSL_VERSION_NUMBER < 0x1000000fL) && !defined(X509_get_X509_PUBKEY)) #define X509_get_X509_PUBKEY(x) ((x)->cert_info->key) #endif