diff options
author | Peter Wu <lekensteyn@gmail.com> | 2013-12-10 23:58:08 +0100 |
---|---|---|
committer | Peter Wu <lekensteyn@gmail.com> | 2013-12-10 23:58:08 +0100 |
commit | 0cac6f1f911590850e90894e14b3ecd0226cfa12 (patch) | |
tree | df90561170f8a6db2cb7541a2c9d55c745ba7db5 /generate-wireshark-cs | |
parent | 8fc4f6c45dc802437376e49dc9c11f2a033dd4c5 (diff) | |
download | wireshark-notes-0cac6f1f911590850e90894e14b3ecd0226cfa12.tar.gz |
More ciphers support
* generate-wireshark-cs: fix key sizes for export ciphers
* notes, openssl-{connect,listen}: support more cipher suites,
including NULL.
Diffstat (limited to 'generate-wireshark-cs')
-rwxr-xr-x | generate-wireshark-cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generate-wireshark-cs b/generate-wireshark-cs index 85a62fc..ca4f790 100755 --- a/generate-wireshark-cs +++ b/generate-wireshark-cs @@ -54,7 +54,10 @@ p() { esac # HACK HACK HACK - tmp=${1#*WITH_} + tmp=$1 + # prevent seeing 56-bit export cipher as 64-bit DES + tmp=${tmp/EXPORT1024_WITH_DES_CBC_/EXPORT1024_WITH_DES_56_CBC_} + tmp=${tmp#*WITH_} cipher=${tmp%%_*} tmp=${tmp/_CBC_/_} tmp=${tmp#${cipher}_} # now continue for keysize @@ -68,6 +71,7 @@ p() { NULL) keysize=0 ;; DES) keysize=64 ;; DES40) keysize=64; exp_keysize=40 ;; + DES56) keysize=64; exp_keysize=56 ;; 3DES) if [[ $keysize == EDE ]]; then keysize=192 @@ -89,7 +93,7 @@ p() { cipher=AES ;; DES|3DES|RC4|RC2|IDEA|AES256|CAMELLIA128|CAMELLIA256|NULL|IDEA) ;; - DES40) cipher=DES ;; + DES40|DES56) cipher=DES ;; SEED*) cipher=SEED ;; RC240|RC256) cipher=RC2 ;; RC440|RC4128|RC456) cipher=RC4 ;; |