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>

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 7e948d25e563b193031c4956e90c4608c573cc87..f2cb4b7c216093542f434321e20cc06391007b43 100644 (file)
--- 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 e3068efb4e8335641e9a4b7204c93678be7fb501..fadb740f45307ea0bfcd9c958208c05c62ef6b35 100644 (file)
--- 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 64db441ac1d82b5111b5357c30c7e4f32792e0ab..e5a94c2ca7a428c329751b525efb89a0c525a953 100644 (file)
--- 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 4a53c5d7654b225911b021386ae80d570722aa1f..c328e1db37cd0bc7c1403e5374066a06a194b35c 100644 (file)
--- 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 6be71fe98a03e93a265e7361668771256a8888d2..393d496cf30a5b41f65ffefba44466479df68ce6 100644 (file)
--- 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 5b053c156aaeea8e62800b9641ba28e8cb8d71bd..7059dac0c43a99cb4ea7fa40fcaacb66b1ffb152 100644 (file)
--- 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"