diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-05-20 16:31:54 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-05-20 16:31:54 +0000 |
commit | 694c6c2e3a683e0231ec3daac131dc823b7b66a7 (patch) | |
tree | 6e3c5600d8556a79835cd1a53c7b4bca0dcf554a /epan/dissectors/packet-eapol.c | |
parent | d86a5a80137d030a36e1b669d141c685b0f9833c (diff) |
Add Modelines Info and fix warning from fix-encoding-args tools
svn path=/trunk/; revision=49438
Diffstat (limited to 'epan/dissectors/packet-eapol.c')
-rw-r--r-- | epan/dissectors/packet-eapol.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 2e132d467a..0442c7036e 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -284,19 +284,19 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_nonce, tvb, offset, - 32, ENC_BIG_ENDIAN); + 32, ENC_NA); offset += 32; proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb, - offset, 16, ENC_BIG_ENDIAN); + offset, 16, ENC_NA); offset += 16; proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_rsc, tvb, offset, - 8, ENC_BIG_ENDIAN); + 8, ENC_NA); offset += 8; proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_id, tvb, offset, 8, - ENC_BIG_ENDIAN); + ENC_NA); offset += 8; proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_mic, tvb, offset, - 16, ENC_BIG_ENDIAN); + 16, ENC_NA); offset += 16; eapol_data_len = tvb_get_ntohs(tvb, offset); proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_data_len, tvb, @@ -304,7 +304,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; if (eapol_data_len != 0) { ti = proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_data, - tvb, offset, eapol_data_len, ENC_BIG_ENDIAN); + tvb, offset, eapol_data_len, ENCNA); if ((keyinfo & KEY_INFO_ENCRYPTED_KEY_DATA_MASK) || !(keyinfo & KEY_INFO_KEY_TYPE_MASK)) { /* RSN: EAPOL-Key Key Data is encrypted. @@ -343,7 +343,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) generated_locally = eapol_len <= 44; /* Size of rc4 key with no key content */ if (!generated_locally) { proto_tree_add_item(eapol_tree, hf_eapol_keydes_key, tvb, offset, - eapol_key_len, ENC_BIG_ENDIAN); + eapol_key_len, ENC_NA); } proto_tree_add_boolean(eapol_tree, hf_eapol_keydes_key_generated_locally, tvb, offset, @@ -545,3 +545,16 @@ proto_reg_handoff_eapol(void) dissector_add_uint("ethertype", ETHERTYPE_EAPOL, eapol_handle); dissector_add_uint("ethertype", ETHERTYPE_RSN_PREAUTH, eapol_handle); } + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ |