aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrei Otcheretianski <andrei.otcheretianski@intel.com>2017-07-05 18:25:07 (GMT)
committerJouni Malinen <j@w1.fi>2017-07-07 20:37:45 (GMT)
commitbfbc41eace06f581dcd080e332fc8ec049d65d9c (patch)
treea2d9367255f548946329cbac4734a005c1fca4d3 /src
parent4874f5bad324341e29c71d28f805aa46b4b2c89a (diff)
downloadhostap-bfbc41eace06f581dcd080e332fc8ec049d65d9c.zip
hostap-bfbc41eace06f581dcd080e332fc8ec049d65d9c.tar.gz
hostap-bfbc41eace06f581dcd080e332fc8ec049d65d9c.tar.bz2
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>
Diffstat (limited to 'src')
-rw-r--r--src/ap/drv_callbacks.c1
-rw-r--r--src/ap/gas_serv.c1
-rw-r--r--src/ap/ieee802_11.c1
-rw-r--r--src/common/dpp.h3
-rw-r--r--src/common/ieee802_11_defs.h3
5 files changed, 3 insertions, 6 deletions
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 7e948d2..f2cb4b7 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 e3068ef..fadb740 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 64db441..e5a94c2 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 4a53c5d..c328e1d 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 6be71fe..393d496 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 */