diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-04-16 15:17:33 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-04-16 15:17:33 +0000 |
| commit | 4c3c50613b5651d7a84ee6eece712d7840035d5b (patch) | |
| tree | 53199e81b55bc9a119982b313987d6e2c34396e9 /epan/dissectors/packet-hip.c | |
| parent | d7192a8bacd968e2297cd4e537722d7ed0eeb3e2 (diff) | |
| download | wireshark-4c3c50613b5651d7a84ee6eece712d7840035d5b.tar.gz | |
From Paco via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7111
HIP dissector of the HIP_CIPHER parameter is wrong
From me:
Add a hf_tlv_cipher_id and use proto_tree_add_item
svn path=/trunk/; revision=42096
Diffstat (limited to 'epan/dissectors/packet-hip.c')
| -rw-r--r-- | epan/dissectors/packet-hip.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index a450bb9bf9..e277688f2c 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -104,7 +104,8 @@ typedef enum { #define PARAM_RELAY_FROM 63998 #define PARAM_RELAY_TO 64002 #define PARAM_RELAY_HMAC 65520 - +/* HIPv2 */ +#define PARAM_HIP_CIPHER 579 /* Bit masks */ #define PARAM_CRITICAL_BIT 0x0001 /* See RFC 5201 section 5.1 */ @@ -165,6 +166,7 @@ static const value_string hip_param_vals[] = { { PARAM_REG_REQUEST, "REG_REQUEST" }, { PARAM_REG_RESPONSE, "REG_RESPONSE" }, { PARAM_REG_FROM, "REG_FROM" }, + { PARAM_HIP_CIPHER, "HIP_CIPHER"}, { 0, NULL } }; @@ -272,6 +274,17 @@ static const value_string nat_traversal_mode_vals[] = { { 0, NULL } }; +/* HIPv2 draft Section 5.2.8 */ +static const value_string cipher_vals[] = { + { 0x0, "Reserved" }, + { 0x01, "NULL-ENCRYPT" }, + { 0x02, "AES-128-CBC" }, + { 0x03, "3DES-CBC" }, + { 0x04, "AES-256-CBC" }, + { 0, NULL } +}; + + /* functions */ static int dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len); @@ -311,6 +324,7 @@ static int hf_hip_tlv_dh_pub = -1; static int hf_hip_tlv_dh_pv_length = -1; static int hf_hip_tlv_trans_id = -1; static int hf_hip_tlv_esp_reserved = -1; +static int hf_hip_tlv_cipher_id = -1; static int hf_hip_tlv_host_id_len = -1; static int hf_hip_tlv_host_di_type = -1; static int hf_hip_tlv_host_di_len = -1; @@ -858,6 +872,16 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len proto_tree_add_text(t, tvb, newoffset, tlv_len - 4, "Encrypted Parameter Data (%u bytes)", tlv_len - 4); break; + case PARAM_HIP_CIPHER: + t = proto_item_add_subtree(ti, ett_hip_tlv_data); + while (tlv_len > 0) { + /* Suite # 1, 2, ..., n + two bytes per Cipher Suite id */ + proto_tree_add_item(t, hf_hip_tlv_cipher_id, tvb, newoffset, 2, ENC_BIG_ENDIAN); + tlv_len -= 2; + newoffset += 2; + } + break; case PARAM_HOST_ID: t = proto_item_add_subtree(ti, ett_hip_tlv_data); hi_len = tvb_get_ntohs(tvb, newoffset); @@ -1284,6 +1308,10 @@ proto_register_hip(void) { "Reserved", "hip.tlv.esp_trans_res", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, + { &hf_hip_tlv_cipher_id, + { "Cipher ID", "hip.tlv.cipher_id", + FT_UINT16, BASE_DEC, VALS(cipher_vals), 0x0, NULL, HFILL }}, + { &hf_hip_tlv_host_id_len, { "Host Identity Length", "hip.tlv.host_id_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, |