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

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Yaniv Kaul <ykaul@xxxxxxxxxxxxxx>
Date: Mon, 26 May 2003 19:04:12 +0200
My apologies. The patch yesterday contained a typo:
'define NUM_GRPDESC_TYPES 18' should have been 'define NUM_GRPDESC_TYPES 19'
Attached diff from today's CVS.

--- packet-isakmp-y.c   Mon May 26 20:10:12 2003
+++ packet-isakmp.c     Mon May 26 20:10:25 2003
@@ -181,7 +181,7 @@
   "KEY_ID"
 };
 
-#define NUM_GRPDESC_TYPES 18
+#define NUM_GRPDESC_TYPES 19
 #define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : "UNKNOWN-GROUP-DESCRIPTION")
 
 static const char *grpdescstr[NUM_GRPDESC_TYPES] = {


Gerald Combs wrote:
Checked in.

On Sun, 25 May 2003, Yaniv Kaul wrote:

  
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",
 };


    
_______________________________________________
Ethereal-dev mailing list
Ethereal-dev@xxxxxxxxxxxx
http://www.ethereal.com/mailman/listinfo/ethereal-dev
  
--- packet-isakmp-y.c	Mon May 26 20:10:12 2003
+++ packet-isakmp.c	Mon May 26 20:10:25 2003
@@ -181,7 +181,7 @@
   "KEY_ID"
 };
 
-#define NUM_GRPDESC_TYPES 18
+#define NUM_GRPDESC_TYPES 19
 #define grpdesc2str(t) ((t < NUM_GRPDESC_TYPES) ? grpdescstr[t] : "UNKNOWN-GROUP-DESCRIPTION")
 
 static const char *grpdescstr[NUM_GRPDESC_TYPES] = {