removed about static_sa.

kame · Feb 22, 2001 · 476bfe2 · 476bfe2
1 parent 53e809d
commit 476bfe2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 51 deletions.
diff --git a/kame/kame/racoon/cfparse.y b/kame/kame/racoon/cfparse.y
@@ -1,4 +1,4 @@
-/*	$KAME: cfparse.y,v 1.86 2001/02/21 05:19:11 sakane Exp $	*/
+/*	$KAME: cfparse.y,v 1.87 2001/02/22 01:11:42 sakane Exp $	*/
 
 %{
 #include <sys/types.h>
@@ -166,9 +166,6 @@ static int expand_isakmpspec __P((int, int, int *,
 %token PREFIX PORT PORTANY UL_PROTO ANY
 %token PFS_GROUP LIFETIME LIFETYPE UNITTYPE STRENGTH
 
-	/* static sa */
-%token STATICSA STATICSA_STATEMENT
-
 %token NUMBER SWITCH BOOLEAN
 %token HEXSTRING QUOTEDSTRING ADDRSTRING
 %token EOS BOC EOC COMMA
@@ -183,7 +180,7 @@ static int expand_isakmpspec __P((int, int, int *,
 %type <num> SECLEVELTYPE SECMODETYPE 
 %type <num> EXCHANGETYPE DOITYPE SITUATIONTYPE
 %type <num> CERTTYPE CERT_X509 PROPOSAL_CHECK_LEVEL
-%type <val> QUOTEDSTRING HEXSTRING ADDRSTRING STATICSA_STATEMENT sainfo_id
+%type <val> QUOTEDSTRING HEXSTRING ADDRSTRING sainfo_id
 %type <val> identifierstring
 %type <spidx> policy_index
 %type <saddr> remote_index ike_addrinfo_port
@@ -1277,17 +1274,6 @@ isakmpproposal_spec
 		}
 	;
 
-	/* static sa */
-staticsa_statement
-	:	STATICSA STATICSA_STATEMENT
-		{
-			/* execute static sa */
-			/* like system("setkey $2->v"); */
-			vfree($2);
-		}
-		EOS
-	;
-
 %%
 
 #if 0

diff --git a/kame/kame/racoon/cftoken.l b/kame/kame/racoon/cftoken.l
@@ -1,4 +1,4 @@
-/*	$KAME: cftoken.l,v 1.50 2001/02/21 05:19:11 sakane Exp $	*/
+/*	$KAME: cftoken.l,v 1.51 2001/02/22 01:11:42 sakane Exp $	*/
 
 %{
 #include <sys/types.h>
@@ -313,28 +313,6 @@ octetstring	{octet}({dot}{octet})+
 <S_RMTP>dh_group	{ YYD; return(DH_GROUP); }
 <S_RMTP>gssapi_id	{ YYD; return(GSSAPI_ID); }
 
-	/* static sa */
-<S_INI>static_sa	{
-				BEGIN S_SA; YYDB;
-				yywarn("staticsa directive don't work yet.");
-				return(STATICSA);
-			}
-<S_SA>{semi}		{ YYD; BEGIN S_INI; return(EOS); }
-<S_SA>[a-zA-Z0-9:\.\-_/ \n\t\"][a-zA-Z0-9:\.\-_/ \n\t\"]* {
-		yymore();
-
-		incstack[incstackp].lineno += yycf_count_nl(yytext);
-
-		yylval.val = vmalloc(yyleng + 1);
-		if (yylval.val == NULL) {
-			yyerror("vmalloc failed");
-			return -1;
-		}
-		memcpy(yylval.val->v, yytext, yylval.val->l);
-
-		return(STATICSA_STATEMENT);
-}
-
 	/* parameter */
 on		{ YYD; yylval.num = TRUE; return(SWITCH); }
 off		{ YYD; yylval.num = FALSE; return(SWITCH); }

diff --git a/kame/kame/racoon/racoon.conf.5 b/kame/kame/racoon/racoon.conf.5
@@ -1,4 +1,4 @@
-.\"	$KAME: racoon.conf.5,v 1.75 2001/02/05 01:03:24 itojun Exp $
+.\"	$KAME: racoon.conf.5,v 1.76 2001/02/22 01:11:42 sakane Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -601,17 +601,6 @@ The default is off.
 .El
 .El
 .\"
-.Ss Static SA configuration
-.Bl -tag -width Ds -compact
-.It Ic static_sa Ar parameters
-specifies static SA.
-This
-.Ar parameters
-will be passed to
-.Xr setkey 8 .
-Not yet.
-.El
-.\"
 .Ss Pre-shared key File
 Pre-shared key file defines a pair of the identifier and the shared secret key
 which are used at Pre-shared key authentication method in phase 1.