From: Ilan Peer <ilan.peer@intel.com>
Date: Mon, 5 Dec 2022 10:42:38 +0000 (+0200)
Subject: HS 2.0: Restore ifdef for DEFINE_STACK_OF in est.c
X-Git-Tag: hostap_2_11~1387
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=909864ab1eea75d9058efef166ae87a26ee07973;p=thirdparty%2Fhostap.git

HS 2.0: Restore ifdef for DEFINE_STACK_OF in est.c

DEFINE_STACK_OF() was only introduced in OpenSSL 1.1.0 and newer, but
the ifdef directive that wrapped it was wrongly removed when cleaning
some BoringSSL definitions. Use ifdef confistently for defining and
using AttrOrOID.

Fixes: faf9c04cb51c ("Remove a host of unnecessary OPENSSL_IS_BORINGSSL ifdefs")
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
---

diff --git a/hs20/client/est.c b/hs20/client/est.c
index c3f27e1e9..5c6e2f67d 100644
--- a/hs20/client/est.c
+++ b/hs20/client/est.c
@@ -218,7 +218,9 @@ typedef struct {
 	} d;
 } AttrOrOID;
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 DEFINE_STACK_OF(AttrOrOID)
+#endif
 
 typedef struct {
 	int type;