From: Emmanuel Hocdet <manu@gandi.net>
Date: Thu, 1 Aug 2019 08:56:45 +0000 (+0200)
Subject: BUILD: ssl: BoringSSL add EVP_PKEY_base_id
X-Git-Tag: v2.1-dev2~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f580d0f3918b31d2b3b3d99c99d120d46c712d2f;p=thirdparty%2Fhaproxy.git

BUILD: ssl: BoringSSL add EVP_PKEY_base_id

Remove EVP_PKEY_base_id compatibility, it is now included in BoringSSL.
---

diff --git a/include/common/openssl-compat.h b/include/common/openssl-compat.h
index 0e05649380..6aa34fa338 100644
--- a/include/common/openssl-compat.h
+++ b/include/common/openssl-compat.h
@@ -179,14 +179,6 @@ static inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x)
 #define __OPENSSL_110_CONST__
 #endif
 
-#ifdef OPENSSL_IS_BORINGSSL
-
-static inline int EVP_PKEY_base_id(EVP_PKEY *pkey)
-{
-	return EVP_PKEY_type(pkey->type);
-}
-#endif
-
 /* ERR_remove_state() was deprecated in 1.0.0 in favor of
  * ERR_remove_thread_state(), which was in turn deprecated in
  * 1.1.0 and does nothing anymore. Let's simply silently kill