osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wifi-dpp: A number of further changes from the recent testing. 

1. Add the crypto suite that came in with a spec change (v171212).
2. Add two additional fields that need handling.
3. Make the attribute value a separate sub-tree.

Change-Id: Ic01527bcd0361bf2522d2efbc91cd8191d7b2e27
Reviewed-on: https://code.wireshark.org/review/25514
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Richard Sharpe 2018-01-29 18:29:58 -08:00 committed by Alexis La Goutte
parent 3dd5574800
commit d328a58fc6
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
epan/dissectors/packet-wifi-dpp.c
View File

@ -148,12 +148,14 @@ static gint ett_wifi_dpp_attributes = -1;
static gint ett_wifi_dpp_pa = -1;
static gint ett_wifi_dpp_attribute = -1;
static gint ett_wifi_dpp_attr_header = -1;
static gint ett_wifi_dpp_attr_value = -1;
static int hf_wifi_dpp_ie_attr_id = -1;
static int hf_wifi_dpp_ie_attr_len = -1;
static int hf_wifi_dpp_ie_generic = -1; /* Remove eventually */
static int hf_wifi_dpp_action_dialog_token = -1;
static int hf_wifi_dpp_action_subtype = -1;
static int hf_wifi_dpp_crypto_suite = -1;
static int hf_wifi_dpp_public_action_subtype = -1;
static int hf_wifi_dpp_status = -1;
static int hf_wifi_dpp_init_hash = -1;
@ -166,6 +168,8 @@ static int hf_wifi_dpp_capabilities = -1;
static int hf_wifi_dpp_code_identifier = -1;
static int hf_wifi_dpp_enc_key_attribute = -1;
static int hf_wifi_dpp_primary_wrapped_data = -1;
static int hf_wifi_dpp_connector_attr = -1;
static int hf_wifi_dpp_initiator_nonce = -1;
static int hf_wifi_dpp_unknown_anqp_item = -1;
static int
@ -195,7 +199,7 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
{
proto_item *si = NULL;
guint8 status;
proto_tree *specific_attr, *attr_hdr;
proto_tree *attr, *specific_attr, *attr_hdr;
guint16 attribute_id;
guint16 attribute_len;
guint attributes_len = 0;
@ -204,13 +208,13 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
while (remaining_len) {
attribute_id = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN);
attribute_len = tvb_get_guint16(tvb, offset + 2, ENC_LITTLE_ENDIAN);
specific_attr = proto_tree_add_subtree_format(tree, tvb, offset,
attr = proto_tree_add_subtree_format(tree, tvb, offset,
attribute_len + 4, ett_wifi_dpp_attribute,
&si, "%s Attribute",
val_to_str(attribute_id,
dpp_ie_attr_ids,
"Unknown (%u)"));
attr_hdr = proto_tree_add_subtree_format(specific_attr, tvb, offset, 4,
attr_hdr = proto_tree_add_subtree_format(attr, tvb, offset, 4,
ett_wifi_dpp_attr_header, NULL,
"Attribute Header");
@ -218,6 +222,10 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
offset += 2;
proto_tree_add_item(attr_hdr, hf_wifi_dpp_ie_attr_len, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
specific_attr = proto_tree_add_subtree(attr, tvb, offset, attribute_len,
ett_wifi_dpp_attr_value,
NULL, "Attribute Value");
switch (attribute_id) {
case DPP_STATUS:
status = tvb_get_guint8(tvb, offset);
@ -267,7 +275,13 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
proto_tree_add_item(specific_attr, hf_wifi_dpp_primary_wrapped_data, tvb, offset, attribute_len, ENC_NA);
break;
case DPP_CONNECTOR:
proto_tree_add_item(specific_attr, hf_wifi_dpp_connector_attr, tvb, offset, attribute_len, ENC_NA);
break;
case DPP_INITIATOR_NONCE:
proto_tree_add_item(specific_attr, hf_wifi_dpp_initiator_nonce, tvb, offset, attribute_len, ENC_NA);
break;
case DPP_INITIATOR_AUTHENTICATING_TAG:
@ -275,8 +289,6 @@ dissect_wifi_dpp_attributes(packet_info *pinfo _U_, proto_tree *tree,
case DPP_CONFIGURATION_OBJECT:
case DPP_CONNECTOR:
case DPP_CONFIGURATION_ATTRIBUTES_OBJECT:
case DPP_BOOTSTRAPPING_KEY:
@ -331,7 +343,8 @@ dissect_wifi_dpp_public_action(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
col_set_str(pinfo->cinfo, COL_PROTOCOL, "wifi_dpp");
subtype = tvb_get_guint8(tvb, offset);
/* The Crypto suite comes before the subtype */
subtype = tvb_get_guint8(tvb, offset + 1);
col_append_fstr(pinfo->cinfo, COL_INFO, ", DPP - %s",
val_to_str(subtype, dpp_public_action_subtypes, "Unknown (%u)"));
@ -342,6 +355,10 @@ dissect_wifi_dpp_public_action(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
proto_item_append_text(dpp_item, ": %s", val_to_str(subtype,
dpp_public_action_subtypes,
"Unknown (%u)"));
proto_tree_add_item(dpp_tree, hf_wifi_dpp_crypto_suite, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset++;
remaining_len--;
proto_tree_add_item(dpp_tree, hf_wifi_dpp_public_action_subtype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset++; /* Skip the OUI Subtype/DPP Request type */
remaining_len--;
@ -407,6 +424,12 @@ proto_register_wifi_dpp(void)
{ &hf_wifi_dpp_primary_wrapped_data,
{ "Wi-Fi DPP Primary Wrapped Data", "dpp.primary.wrapped_data",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_wifi_dpp_connector_attr,
{ "Wi-Fi DPP Connector Attribute", "dpp.connector_data",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_wifi_dpp_initiator_nonce,
{ "Wi-Fi DPP Initiator Nonce", "dpp.initiator_nonce",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_wifi_dpp_ie_attr_id,
{ "Wi-Fi DPP IE Attribute ID", "dpp.ie.attr_id",
FT_UINT16, BASE_HEX, VALS(dpp_ie_attr_ids), 0x0, NULL, HFILL }},
@ -422,6 +445,9 @@ proto_register_wifi_dpp(void)
{ &hf_wifi_dpp_action_dialog_token,
{ "Wi-Fi DPP Action Dialog Token", "dpp.action.dialog_token",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_wifi_dpp_crypto_suite,
{ "Wi-Fi DPP Cryptographic Suite", "dpp.public_action.crypto_suite",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_wifi_dpp_public_action_subtype,
{ "Wi-Fi DPP Public Action Subtype", "dpp.public_action.subtype",
FT_UINT8, BASE_DEC, VALS(dpp_public_action_subtypes), 0x0, NULL, HFILL }},
@ -435,6 +461,7 @@ proto_register_wifi_dpp(void)
&ett_wifi_dpp_pa,
&ett_wifi_dpp_attribute,
&ett_wifi_dpp_attr_header,
&ett_wifi_dpp_attr_value,
};
proto_wifi_dpp = proto_register_protocol("Wi-Fi Device Provisioning Protocol", "Wi-Fi DPP", "dpp");