DPP2: Build configuration flags for DPP version 2 support

The new CONFIG_DPP2=y build option for hostapd and wpa_supplicant is
used to control whether new functionality defined after the DPP
specification v1.0 is included. All such functionality are considered
experimental and subject to change without notice and as such, not
suitable for production use.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index bdc87067c7e5ec3225278783742a201b613f9033..57a894cc7f8c64889f75095a0e42d4a038611077 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -554,6 +554,9 @@ NEED_SHA512=y
 NEED_JSON=y
 NEED_GAS=y
 NEED_BASE64=y
+ifdef CONFIG_DPP2
+L_CFLAGS += -DCONFIG_DPP2
+endif
 endif
 
 ifdef CONFIG_EAP_IKEV2

diff --git a/hostapd/Makefile b/hostapd/Makefile
index dd3816e0d440776b708015b9adc20e4c19fcec67..6e263c5a4afcb110e244f3209721425751bb4ce5 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -588,6 +588,9 @@ NEED_SHA512=y
 NEED_JSON=y
 NEED_GAS=y
 NEED_BASE64=y
+ifdef CONFIG_DPP2
+CFLAGS += -DCONFIG_DPP2
+endif
 endif
 
 ifdef CONFIG_EAP_IKEV2

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 6a9aa091a8e6a582414042fa07194f067006fc4f..529693131308f4971c6337c6778bc8ca08562fc0 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -259,6 +259,9 @@ NEED_SHA512=y
 NEED_JSON=y
 NEED_GAS_SERVER=y
 NEED_BASE64=y
+ifdef CONFIG_DPP2
+L_CFLAGS += -DCONFIG_DPP2
+endif
 endif
 
 ifdef CONFIG_OWE

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 4187bae48b602bd4d931a7d4696f0c0edba89d97..e81238e3924e00431ba3978928285e35a0c9440d 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -291,6 +291,9 @@ NEED_SHA512=y
 NEED_JSON=y
 NEED_GAS_SERVER=y
 NEED_BASE64=y
+ifdef CONFIG_DPP2
+CFLAGS += -DCONFIG_DPP2
+endif
 endif
 
 ifdef CONFIG_OWE