DPP2: New identifier definitions

Add new identifier definitions for presence announcement,
reconfiguration, and certificate enrollment.

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

diff --git a/src/common/dpp.h b/src/common/dpp.h
index bab83a8a4ee0e82cd85938ff424101b61604c2e3..9f3e04820cef8ab30df4dcaad94f4a82110a8aea 100644 (file)
--- a/src/common/dpp.h
+++ b/src/common/dpp.h
@@ -36,6 +36,11 @@ enum dpp_public_action_frame_type {
        DPP_PA_PKEX_COMMIT_REVEAL_RESP = 10,
        DPP_PA_CONFIGURATION_RESULT = 11,
        DPP_PA_CONNECTION_STATUS_RESULT = 12,
+       DPP_PA_PRESENCE_ANNOUNCEMENT = 13,
+       DPP_PA_RECONFIG_ANNOUNCEMENT = 14,
+       DPP_PA_RECONFIG_AUTH_REQ = 15,
+       DPP_PA_RECONFIG_AUTH_RESP = 16,
+       DPP_PA_RECONFIG_AUTH_CONF = 17,
 };
 
 enum dpp_attribute_id {
@@ -67,6 +72,9 @@ enum dpp_attribute_id {
        DPP_ATTR_ENVELOPED_DATA = 0x101A,
        DPP_ATTR_SEND_CONN_STATUS = 0x101B,
        DPP_ATTR_CONN_STATUS = 0x101C,
+       DPP_ATTR_RECONFIG_FLAGS = 0x101D,
+       DPP_ATTR_C_SIGN_KEY_HASH = 0x101E,
+       DPP_ATTR_CSR_ATTR_REQ = 0x101F,
 };
 
 enum dpp_status_error {
@@ -81,6 +89,9 @@ enum dpp_status_error {
        DPP_STATUS_NO_MATCH = 8,
        DPP_STATUS_CONFIG_REJECTED = 9,
        DPP_STATUS_NO_AP = 10,
+       DPP_STATUS_CONFIGURE_PENDING = 11,
+       DPP_STATUS_CSR_NEEDED = 12,
+       DPP_STATUS_CSR_BAD = 13,
 };
 
 #define DPP_CAPAB_ENROLLEE BIT(0)

diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c
index 6aa38cab28e60d284c690f4d27d6d7ee9ad7e40b..e7ee24e2a64948e76e576345dd3a6aa8c0d4fbcb 100644 (file)
--- a/src/common/ieee802_11_common.c
+++ b/src/common/ieee802_11_common.c
@@ -133,6 +133,9 @@ static int ieee802_11_parse_vendor_specific(const u8 *pos, size_t elen,
                case OWE_OUI_TYPE:
                        /* OWE Transition Mode element */
                        break;
+               case DPP_CC_OUI_TYPE:
+                       /* DPP Configurator Connectivity element */
+                       break;
                default:
                        wpa_printf(MSG_MSGDUMP, "Unknown WFA "
                                   "information element ignored "

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 7c51574b5888cd471c55514e28f1d17b4e6e1d50..6c88dda462e123bf7c27ef9254089967381ccb19 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -1316,6 +1316,8 @@ struct ieee80211_ampe_ie {
 #define OWE_IE_VENDOR_TYPE 0x506f9a1c
 #define OWE_OUI_TYPE 28
 #define MULTI_AP_OUI_TYPE 0x1B
+#define DPP_CC_IE_VENDOR_TYPE 0x506f9a1e
+#define DPP_CC_OUI_TYPE 0x1e
 
 #define MULTI_AP_SUB_ELEM_TYPE 0x06
 #define MULTI_AP_TEAR_DOWN BIT(4)