Wireshark · Ethereal-dev: [Ethereal-dev] patch for packet-isakmp.c - add RFC3526 DH MODP groups

[Yaniv Kaul <ykaul@xxxxxxxxxxxxxx>]

Attached and below:
--- packet-isakmp-y.c   Sun May 25 18:11:34 2003
+++ packet-isakmp.c     Sun May 25 18:14:46 2003
@@ -181,7 +181,7 @@
  "KEY_ID"
};

-#define NUM_GRPDESC_TYPES 14
+#define NUM_GRPDESC_TYPES 18
#define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : 
"UKNOWEN GROUP DESCRIPTION")

static const char *grpdescstr[NUM_GRPDESC_TYPES] = {
@@ -190,7 +190,7 @@
  "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 @@
  "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",
};

--- packet-isakmp-y.c	Sun May 25 18:11:34 2003
+++ packet-isakmp.c	Sun May 25 18:14:46 2003
@@ -181,7 +181,7 @@
   "KEY_ID"
 };
 
-#define NUM_GRPDESC_TYPES 14
+#define NUM_GRPDESC_TYPES 18
 #define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : "UKNOWEN GROUP DESCRIPTION")
 
 static const char *grpdescstr[NUM_GRPDESC_TYPES] = {
@@ -190,7 +190,7 @@
   "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 @@
   "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 {