Permalink
Browse files

fixed to parse modp1536 of DH group. reported by <shigeru@iij.ad.jp>.

  • Loading branch information...
1 parent 2d993fc commit 58f7a582c22862277a2b2857329f6f3a1b5d8f4f sakane committed Mar 21, 2001
Showing with 6 additions and 19 deletions.
  1. +3 −2 kame/kame/racoon/algorithm.h
  2. +3 −17 kame/kame/racoon/cfparse.y
@@ -1,4 +1,4 @@
-/* $KAME: algorithm.h,v 1.11 2000/12/12 16:59:33 thorpej Exp $ */
+/* $KAME: algorithm.h,v 1.12 2001/03/21 22:38:29 sakane Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,8 +93,9 @@ enum {
enum {
/* dh_group */
/* 0 is defined as algtype_nothing above. */
- algtype_modp768 = 1, algtype_modp1024, algtype_modp1536,
+ algtype_modp768 = 1, algtype_modp1024,
algtype_ec2n155, algtype_ec2n185,
+ algtype_modp1536,
};
enum {
View
@@ -1,4 +1,4 @@
-/* $KAME: cfparse.y,v 1.93 2001/03/21 22:18:55 sakane Exp $ */
+/* $KAME: cfparse.y,v 1.94 2001/03/21 22:38:29 sakane Exp $ */
%{
#include <sys/types.h>
@@ -487,14 +487,7 @@ policy_spec
: PFS_GROUP dh_group_num
{
/*
- int doi;
-
- doi = algtype2doi(algclass_isakmp_dh, $2);
- if (doi == -1) {
- yyerror("must be DH group");
- return -1;
- }
- cur_spidx->policy->pfs_group = doi;
+ cur_spidx->policy->pfs_group = $2;
*/
}
EOS
@@ -788,14 +781,7 @@ sainfo_specs
sainfo_spec
: PFS_GROUP dh_group_num
{
- int doi;
-
- doi = algtype2doi(algclass_isakmp_dh, $2);
- if (doi == -1) {
- yyerror("must be DH group");
- return -1;
- }
- cur_sainfo->pfs_group = doi;
+ cur_sainfo->pfs_group = $2;
}
EOS
| LIFETIME LIFETYPE_TIME NUMBER unittype_time

0 comments on commit 58f7a58

Please sign in to comment.