RFC3526 groups support. Damien Miller and hshoexer

kame · Dec 14, 2003 · e103c3b · e103c3b
1 parent 0e30cb6
commit e103c3b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/kame/kame/racoon/cfparse.y b/kame/kame/racoon/cfparse.y
@@ -1,4 +1,4 @@
-/*	$KAME: cfparse.y,v 1.118 2003/07/12 09:34:48 itojun Exp $	*/
+/*	$KAME: cfparse.y,v 1.119 2003/12/14 04:13:11 itojun Exp $	*/
 
 %{
 /*
@@ -112,6 +112,19 @@ static int num2dhgroup[] = {
 	OAKLEY_ATTR_GRP_DESC_EC2N155,
 	OAKLEY_ATTR_GRP_DESC_EC2N185,
 	OAKLEY_ATTR_GRP_DESC_MODP1536,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	OAKLEY_ATTR_GRP_DESC_MODP2048,
+	OAKLEY_ATTR_GRP_DESC_MODP3072,
+	OAKLEY_ATTR_GRP_DESC_MODP4096,
+	OAKLEY_ATTR_GRP_DESC_MODP6144,
+	OAKLEY_ATTR_GRP_DESC_MODP8192
 };
 
 static struct remoteconf *cur_rmconf;

diff --git a/kame/kame/racoon/dhgroup.h b/kame/kame/racoon/dhgroup.h
@@ -1,4 +1,4 @@
-/*	$KAME: dhgroup.h,v 1.2 2001/12/12 18:23:41 sakane Exp $	*/
+/*	$KAME: dhgroup.h,v 1.3 2003/12/14 04:13:11 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -53,7 +53,7 @@
 	"83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D" \
 	"670C354E 4ABC9804 F1746C08 CA237327 FFFFFFFF FFFFFFFF"
 
-/* draft-ietf-ipsec-ike-modp-groups-03.txt */
+/* RFC 3526 */
 #define OAKLEY_PRIME_MODP2048 \
 	"FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1" \
 	"29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD" \

diff --git a/kame/kame/racoon/oakley.h b/kame/kame/racoon/oakley.h
@@ -1,4 +1,4 @@
-/*	$KAME: oakley.h,v 1.29 2003/06/27 12:02:41 sakane Exp $	*/
+/*	$KAME: oakley.h,v 1.30 2003/12/14 04:13:11 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -76,11 +76,11 @@
 #define   OAKLEY_ATTR_GRP_DESC_EC2N155		3
 #define   OAKLEY_ATTR_GRP_DESC_EC2N185		4
 #define   OAKLEY_ATTR_GRP_DESC_MODP1536		5
-#define   OAKLEY_ATTR_GRP_DESC_MODP2048		42048	/* these value are */
+#define   OAKLEY_ATTR_GRP_DESC_MODP2048		14
-#define   OAKLEY_ATTR_GRP_DESC_MODP3072		43072	/* make consensus  */
+#define   OAKLEY_ATTR_GRP_DESC_MODP3072		15
-#define   OAKLEY_ATTR_GRP_DESC_MODP4096		44096	/* at the bake off */
+#define   OAKLEY_ATTR_GRP_DESC_MODP4096		16
-#define   OAKLEY_ATTR_GRP_DESC_MODP8192		48192	/* in helsinki     */
+#define   OAKLEY_ATTR_GRP_DESC_MODP6144		17
-#define   OAKLEY_ATTR_GRP_DESC_MODP6144		46144	/* XXX */
+#define   OAKLEY_ATTR_GRP_DESC_MODP8192		18
 					/*	32768 - 65535 Private Use */
 #define OAKLEY_ATTR_GRP_TYPE		5 /* B */
 #define   OAKLEY_ATTR_GRP_TYPE_MODP		1