jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP: Fix compilation without openssl

Browse source 
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>
This commit is contained in:
Andrei Otcheretianski 2017-07-05 21:25:07 +03:00 committed by Jouni Malinen
parent 4874f5bad3
commit bfbc41eace
6 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ap/drv_callbacks.c
View file

@ -14,7 +14,6 @@
#include "drivers/driver.h" #include "drivers/driver.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "common/dpp.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "crypto/random.h" #include "crypto/random.h"
#include "p2p/p2p.h" #include "p2p/p2p.h"

1
src/ap/gas_serv.c
View file

@ -11,7 +11,6 @@
#include "common.h" #include "common.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/gas.h" #include "common/gas.h"
#include "common/dpp.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "hostapd.h" #include "hostapd.h"

1
src/ap/ieee802_11.c
View file

@ -19,7 +19,6 @@
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "common/sae.h" #include "common/sae.h"
#include "common/dpp.h"
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "p2p/p2p.h" #include "p2p/p2p.h"

3
src/common/dpp.h
View file

@ -15,9 +15,6 @@
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"
/* DPP Public Action frame identifiers - OUI_WFA */
#define DPP_OUI_TYPE 0x1A
enum dpp_public_action_frame_type { enum dpp_public_action_frame_type {
DPP_PA_AUTHENTICATION_REQ = 0, DPP_PA_AUTHENTICATION_REQ = 0,
DPP_PA_AUTHENTICATION_RESP = 1, DPP_PA_AUTHENTICATION_RESP = 1,

3
src/common/ieee802_11_defs.h
View file

@ -2025,4 +2025,7 @@ struct ieee80211_he_operation {
#define HE_OPERATION_BSS_COLOR_DISABLED ((u32) BIT(30)) #define HE_OPERATION_BSS_COLOR_DISABLED ((u32) BIT(30))
#define HE_OPERATION_BSS_DUAL_BEACON ((u32) BIT(31)) #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 */ #endif /* IEEE802_11_DEFS_H */

1
wpa_supplicant/events.c
View file

@ -28,7 +28,6 @@
#include "notify.h" #include "notify.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "common/dpp.h"
#include "common/gas_server.h" #include "common/gas_server.h"
#include "crypto/random.h" #include "crypto/random.h"
#include "blacklist.h" #include "blacklist.h"