diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-07-05 19:10:46 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-07-05 19:10:46 +0000 |
| commit | a0c01750b8a8fd0a7b09552e493640ab54783310 (patch) | |
| tree | 4b98995ef9a2013b29e8d30120c9e5c0565d0128 /plugins | |
| parent | 889ddbd9ebaa85e42da97ad9c8c460b55ce5b8e1 (diff) | |
From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7439 :
Add support for DOCSIS 3.0 AES keys
svn path=/trunk/; revision=43573
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/docsis/packet-bpkmattr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index 307fbd1ef9..fcf49961b1 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -121,8 +121,9 @@ static const value_string error_code_vals[] = { }; static const value_string crypto_suite_attr_vals[] = { - {0x0100, "CBC Mode, 56 Bit DES & no Data Authentication"}, - {0x0200, "CBC Mode, 40 Bit DES & no Data Authentication"}, + {0x0100, "CBC-Mode 56-bit DES, no data authentication"}, + {0x0200, "CBC-Mode 40-bit DES, no data authentication"}, + {0x0300, "CBC-Mode 128-bit AES, no data authentication"}, {0, NULL}, }; @@ -204,7 +205,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) THROW (ReportedBoundsError); break; case BPKM_TEK: - if (length == 8) + if (length == 8 || length == 16) proto_tree_add_item (tree, hf_docsis_bpkmattr_tek, tvb, pos, length, ENC_NA); else @@ -249,7 +250,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_OBSOLETED: break; case BPKM_CBC_IV: - if (length == 8) + if (length == 8 || length == 16) proto_tree_add_item (tree, hf_docsis_bpkmattr_cbc_iv, tvb, pos, length, ENC_NA); else |