]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: ssl: adjust guard for X509_get_X509_PUBKEY(x)
authorIlya Shipitsin <chipitsine@gmail.com>
Mon, 31 Jan 2022 04:45:00 +0000 (09:45 +0500)
committerWilliam Lallemand <wlallemand@haproxy.org>
Wed, 2 Feb 2022 16:47:57 +0000 (17:47 +0100)
BoringSSL defines that function since
https://boringssl.googlesource.com/boringssl/+/33f8d33af0dcb083610e978baad5a8b6e1cfee82

include/haproxy/openssl-compat.h

index 123b76ede1a6c929badb0d5c783b96c10948f45d..d34a22efcd79de20330ce2a1dabb811e397c6b9d 100644 (file)
@@ -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