diff options
| author | Peter Wu <lekensteyn@gmail.com> | 2013-12-06 18:44:37 +0100 |
|---|---|---|
| committer | Peter Wu <lekensteyn@gmail.com> | 2013-12-06 18:44:37 +0100 |
| commit | 964d3d58193ae4d1e877c5ced8c6762aa83ad5db (patch) | |
| tree | f9c625ef8bcfc80fa1f9a0aa25b18eef0d58dc86 /generate-wireshark-cs | |
| parent | 22acd0f9d1b8f7af840ba77a7ebdb927e56b7101 (diff) | |
| download | wireshark-notes-964d3d58193ae4d1e877c5ced8c6762aa83ad5db.tar.gz | |
generate-wireshark-cs: CCM support
Diffstat (limited to 'generate-wireshark-cs')
| -rwxr-xr-x | generate-wireshark-cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/generate-wireshark-cs b/generate-wireshark-cs index 66ca152..99cfd29 100755 --- a/generate-wireshark-cs +++ b/generate-wireshark-cs @@ -105,6 +105,8 @@ p() { ;; esac + # diglen is unused here, but shown for clarity (when a new digest is + # added to packet-ssl-utils) dig=${1##*_} case $dig in MD5) diglen=16 ;; @@ -112,8 +114,13 @@ p() { SHA256) diglen=32 ;; SHA384) diglen=48 ;; *) - warn "Unknown dig in $hexid $1 (dig=$dig)" - return + # CCM (counter with CBC-MAC) includes MAC already. + if [[ $1 == *_CCM_8 ]] || [[ $1 == *_CCM ]]; then + dig=NA + else + warn "Unknown dig in $hexid $1 (dig=$dig)" + return + fi ;; esac |