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

@@ -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"

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"

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"

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,

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 */

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"