From bfbc41eace06f581dcd080e332fc8ec049d65d9c Mon Sep 17 00:00:00 2001
From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Date: Wed, 5 Jul 2017 21:25:07 +0300
Subject: [PATCH] DPP: Fix compilation without openssl

dpp.h file requires openssl in order to compile, which breaks
compilation on systems without it.
Move DPP_OUI_TYPE to ieee802_11_defs.h and don't include dpp.h when
not really needed.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
---
 src/ap/drv_callbacks.c       | 1 -
 src/ap/gas_serv.c            | 1 -
 src/ap/ieee802_11.c          | 1 -
 src/common/dpp.h             | 3 ---
 src/common/ieee802_11_defs.h | 3 +++
 wpa_supplicant/events.c      | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 7e948d25e..f2cb4b7c2 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -14,7 +14,6 @@
 #include "drivers/driver.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
-#include "common/dpp.h"
 #include "common/wpa_ctrl.h"
 #include "crypto/random.h"
 #include "p2p/p2p.h"
diff --git a/src/ap/gas_serv.c b/src/ap/gas_serv.c
index e3068efb4..fadb740f4 100644
--- a/src/ap/gas_serv.c
+++ b/src/ap/gas_serv.c
@@ -11,7 +11,6 @@
 #include "common.h"
 #include "common/ieee802_11_defs.h"
 #include "common/gas.h"
-#include "common/dpp.h"
 #include "common/wpa_ctrl.h"
 #include "utils/eloop.h"
 #include "hostapd.h"
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 64db441ac..e5a94c2ca 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -19,7 +19,6 @@
 #include "common/ieee802_11_common.h"
 #include "common/wpa_ctrl.h"
 #include "common/sae.h"
-#include "common/dpp.h"
 #include "radius/radius.h"
 #include "radius/radius_client.h"
 #include "p2p/p2p.h"
diff --git a/src/common/dpp.h b/src/common/dpp.h
index 4a53c5d76..c328e1db3 100644
--- a/src/common/dpp.h
+++ b/src/common/dpp.h
@@ -15,9 +15,6 @@
 #include "common/wpa_common.h"
 #include "crypto/sha256.h"
 
-/* DPP Public Action frame identifiers - OUI_WFA */
-#define DPP_OUI_TYPE 0x1A
-
 enum dpp_public_action_frame_type {
 	DPP_PA_AUTHENTICATION_REQ = 0,
 	DPP_PA_AUTHENTICATION_RESP = 1,
diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 6be71fe98..393d496cf 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -2025,4 +2025,7 @@ struct ieee80211_he_operation {
 #define HE_OPERATION_BSS_COLOR_DISABLED		((u32) BIT(30))
 #define HE_OPERATION_BSS_DUAL_BEACON		((u32) BIT(31))
 
+/* DPP Public Action frame identifiers - OUI_WFA */
+#define DPP_OUI_TYPE 0x1A
+
 #endif /* IEEE802_11_DEFS_H */
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 5b053c156..7059dac0c 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -28,7 +28,6 @@
 #include "notify.h"
 #include "common/ieee802_11_defs.h"
 #include "common/ieee802_11_common.h"
-#include "common/dpp.h"
 #include "common/gas_server.h"
 #include "crypto/random.h"
 #include "blacklist.h"