aboutsummaryrefslogtreecommitdiffstats
path: root/packet-isakmp.c
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2003-05-25 16:49:47 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2003-05-25 16:49:47 +0000
commit98294741b0b27388259cecf59eff2a17c3ce03b5 (patch)
tree6da3990e372b4ac70ba834d829442c15051bdda5 /packet-isakmp.c
parent258ffcde58472d71f121a7955f8b1ff7908b1911 (diff)
From Yaniv Kaul: add RFC3526 DH MODP groups.
Fix a typo. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7739 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-isakmp.c')
-rw-r--r--packet-isakmp.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/packet-isakmp.c b/packet-isakmp.c
index 04f26b3b0e..ac335d00d7 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -4,7 +4,7 @@
* for ISAKMP (RFC 2407)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.62 2003/05/24 17:45:10 gerald Exp $
+ * $Id: packet-isakmp.c,v 1.63 2003/05/25 16:49:47 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -181,8 +181,8 @@ static const char *idtypestr[NUM_ID_TYPES] = {
"KEY_ID"
};
-#define NUM_GRPDESC_TYPES 14
-#define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : "UKNOWEN GROUP DESCRIPTION")
+#define NUM_GRPDESC_TYPES 18
+#define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : "UNKNOWN-GROUP-DESCRIPTION")
static const char *grpdescstr[NUM_GRPDESC_TYPES] = {
"UNDEFINED - 0",
@@ -190,7 +190,7 @@ static const char *grpdescstr[NUM_GRPDESC_TYPES] = {
"Alternate 1024-bit MODP group",
"EC2N group on GP[2^155] group",
"EC2N group on GP[2^185] group",
- "Reserved to IANA",
+ "1536 bit MODP group",
"EC2N group over GF[2^163]",
"EC2N group over GF[2^163]",
"EC2N group over GF[2^283]",
@@ -198,7 +198,12 @@ static const char *grpdescstr[NUM_GRPDESC_TYPES] = {
"EC2N group over GF[2^409]",
"EC2N group over GF[2^409]",
"EC2N group over GF[2^571]",
- "EC2N group over GF[2^571]"
+ "EC2N group over GF[2^571]",
+ "2048 bit MODP group",
+ "3072 bit MODP group",
+ "4096 bit MODP group",
+ "6144 bit MODP group",
+ "8192 bit MODP group",
};
struct isakmp_hdr {