Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parses remoteid/ph1id values

Browse Source
This commit is contained in:
vanhu 2006-10-03 08:03:33 +00:00
parent dd3c365568
commit 7d2c6acefd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/dist/ipsec-tools/src/racoon/cfparse.y vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: cfparse.y,v 1.15 2006/09/26 21:42:55 manu Exp $ */
/* $NetBSD: cfparse.y,v 1.16 2006/10/03 08:03:33 vanhu Exp $ */
/* Id: cfparse.y,v 1.66 2006/08/22 18:17:17 manubsd Exp */
@ -231,10 +231,11 @@ static int fix_lifebyte __P((u_long));
%token GSS_ID GSS_ID_ENC GSS_ID_ENCTYPE
%token COMPLEX_BUNDLE
%token DPD DPD_DELAY DPD_RETRY DPD_MAXFAIL
%token PH1ID
%token XAUTH_LOGIN WEAK_PHASE1_CHECK
%token PREFIX PORT PORTANY UL_PROTO ANY IKE_FRAG ESP_FRAG MODE_CFG
%token PFS_GROUP LIFETIME LIFETYPE_TIME LIFETYPE_BYTE STRENGTH
%token PFS_GROUP LIFETIME LIFETYPE_TIME LIFETYPE_BYTE STRENGTH REMOTEID
%token SCRIPT PHASE1_UP PHASE1_DOWN
@ -1152,7 +1153,8 @@ sainfo_statement
/* duplicate check */
check = getsainfo(cur_sainfo->idsrc,
cur_sainfo->iddst,
cur_sainfo->id_i);
cur_sainfo->id_i,
cur_sainfo->remoteid);
if (check && (!check->idsrc && !cur_sainfo->idsrc)) {
yyerror("duplicated sainfo: %s",
sainfo2str(cur_sainfo));
@ -1383,6 +1385,11 @@ sainfo_spec
cur_sainfo->pfs_group = $2;
}
EOS
| REMOTEID NUMBER
{
cur_sainfo->remoteid = $2;
}
EOS
| LIFETIME LIFETYPE_TIME NUMBER unittype_time
{
cur_sainfo->lifetime = $3 * $4;
@ -1883,6 +1890,11 @@ remote_spec
#endif
}
EOS
| PH1ID NUMBER
{
cur_rmconf->ph1id = $2;
}
EOS
| LIFETIME LIFETYPE_TIME NUMBER unittype_time
{
cur_rmconf->prhead->lifetime = $3 * $4;

4
crypto/dist/ipsec-tools/src/racoon/cftoken.l vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: cftoken.l,v 1.8 2006/09/18 20:32:40 manu Exp $ */
/* $NetBSD: cftoken.l,v 1.9 2006/10/03 08:03:34 vanhu Exp $ */
/* Id: cftoken.l,v 1.53 2006/08/22 18:17:17 manubsd Exp */
@ -288,6 +288,7 @@ hexstring 0x{hexdigit}+
<S_SAINF>{semi} { BEGIN S_INI; return(EOS); }
<S_SAINFS>{ecl} { BEGIN S_INI; return(EOC); }
<S_SAINFS>pfs_group { YYD; return(PFS_GROUP); }
<S_SAINFS>remoteid { YYD; return(REMOTEID); }
<S_SAINFS>identifier { YYD; yywarn("it is obsoleted. use \"my_identifier\"."); return(IDENTIFIER); }
<S_SAINFS>my_identifier { YYD; return(MY_IDENTIFIER); }
<S_SAINFS>lifetime { YYD; return(LIFETIME); }
@ -354,6 +355,7 @@ hexstring 0x{hexdigit}+
<S_RMTS>dpd_delay { YYD; return(DPD_DELAY); }
<S_RMTS>dpd_retry { YYD; return(DPD_RETRY); }
<S_RMTS>dpd_maxfail { YYD; return(DPD_MAXFAIL); }
<S_RMTS>ph1id { YYD; return(PH1ID); }
<S_RMTS>ike_frag { YYD; return(IKE_FRAG); }
<S_RMTS>esp_frag { YYD; return(ESP_FRAG); }
<S_RMTS>script { YYD; return(SCRIPT); }