]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
DPP: Fix a regression in non-DPP, non-OpenSSL builds
authorJouni Malinen <jouni@codeaurora.org>
Mon, 8 Apr 2019 15:07:28 +0000 (18:07 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 8 Apr 2019 15:13:19 +0000 (18:13 +0300)
Inclusion of common/dpp.h into hostapd/main.c brought in an undesired
unconditional dependency on OpenSSL header files even for builds where
DPP is not enabled. Fix this by making the dpp.h contents, and in
particular the inclusion of openssl/x509.h, conditional on CONFIG_DPP.

Fixes: 87d8435cf9fd ("DPP: Common configurator/bootstrapping data management")
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
src/common/dpp.h

index 0a812268510be1cf6f2370c368b448d771c919cc..5a6d8cc79c2cf9ee33ff0e67fdb996544c6943b9 100644 (file)
@@ -10,6 +10,7 @@
 #ifndef DPP_H
 #define DPP_H
 
+#ifdef CONFIG_DPP
 #include <openssl/x509.h>
 
 #include "utils/list.h"
@@ -500,4 +501,5 @@ struct dpp_global * dpp_global_init(void);
 void dpp_global_clear(struct dpp_global *dpp);
 void dpp_global_deinit(struct dpp_global *dpp);
 
+#endif /* CONFIG_DPP */
 #endif /* DPP_H */