aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zrtp.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2009-08-02 12:53:14 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2009-08-02 12:53:14 +0000
commit672a9f6e62b6231ba96cf3ddd8f792b5264a6e84 (patch)
tree25009271ba4e8430b0bb3daee95fb8cf58531f9f /epan/dissectors/packet-zrtp.c
parent18478a63bc80e185d9f320fc67c232cb088d9fa6 (diff)
Add additional cypher types.
svn path=/trunk/; revision=29260
Diffstat (limited to 'epan/dissectors/packet-zrtp.c')
-rw-r--r--epan/dissectors/packet-zrtp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 4efbbc118a..1bb9e129fd 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -1,6 +1,6 @@
/* packet-zrtp.c
* Routines for zrtp packet dissection
- * IETF draft draft-zimmermann-avt-zrtp-15
+ * IETF draft draft-zimmermann-avt-zrtp-15x
* Copyright 2007, Sagar Pai <sagar@gmail.com>
*
* $Id$
@@ -192,6 +192,12 @@ const value_string_keyval zrtp_cipher_type_vals[] =
{ "AES1", "AES-CM with 128 bit keys"},
{ "AES2", "AES-CM with 192 bit keys"},
{ "AES3", "AES-CM with 256 bit keys"},
+ { "2FS1", "TwoFish with 128 bit keys"},
+ { "2FS2", "TwoFish with 192 bit keys"},
+ { "2FS3", "TwoFish with 256 bit keys"},
+ { "CAM1", "Camellia with 128 bit keys"},
+ { "CAM2", "Camellia with 192 bit keys"},
+ { "CAM3", "Camellia with 256 bit keys"},
{ NULL, NULL }
};