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

sync with recent net/pfkeyv2.h change (sorry forgot to commit). from kame

This commit is contained in:
itojun 2000-07-18 23:29:48 +00:00
parent 067b7521b5
commit 6a202d75eb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/setkey/parse.y
View File

@ -1,5 +1,5 @@
/* $NetBSD: parse.y,v 1.1 2000/06/13 15:15:24 itojun Exp $ */
/* $KAME: parse.y,v 1.29 2000/06/10 14:17:44 sakane Exp $ */
/* $NetBSD: parse.y,v 1.2 2000/07/18 23:29:48 itojun Exp $ */
/* $KAME: parse.y,v 1.30 2000/07/15 16:08:01 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@ -327,7 +327,7 @@ auth_alg
auth_key
: /*NOTHING*/
{
if (p_alg_auth != SADB_AALG_NULL) {
if (p_alg_auth != SADB_X_AALG_NULL) {
yyerror("no key found.");
return -1;
}

14
sbin/setkey/token.l
View File

@ -1,5 +1,5 @@
/* $NetBSD: token.l,v 1.1 2000/06/13 15:15:28 itojun Exp $ */
/* $KAME: token.l,v 1.13 2000/06/07 00:29:14 itojun Exp $ */
/* $NetBSD: token.l,v 1.2 2000/07/18 23:29:49 itojun Exp $ */
/* $KAME: token.l,v 1.14 2000/07/15 16:08:01 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@ -160,17 +160,17 @@ ipcomp { PREPROC; yylval.num = 0; return(PR_IPCOMP); }
{hyphen}A { PREPROC; return(F_AUTH); }
hmac-md5 { PREPROC; yylval.num = SADB_AALG_MD5HMAC; return(ALG_AUTH); }
hmac-sha1 { PREPROC; yylval.num = SADB_AALG_SHA1HMAC; return(ALG_AUTH); }
keyed-md5 { PREPROC; yylval.num = SADB_AALG_MD5; return(ALG_AUTH); }
keyed-sha1 { PREPROC; yylval.num = SADB_AALG_SHA; return(ALG_AUTH); }
null { PREPROC; yylval.num = SADB_AALG_NULL; return(ALG_AUTH); }
keyed-md5 { PREPROC; yylval.num = SADB_X_AALG_MD5; return(ALG_AUTH); }
keyed-sha1 { PREPROC; yylval.num = SADB_X_AALG_SHA; return(ALG_AUTH); }
null { PREPROC; yylval.num = SADB_X_AALG_NULL; return(ALG_AUTH); }
/* encryption alogorithm */
{hyphen}E { PREPROC; return(F_ENC); }
des-cbc { PREPROC; yylval.num = SADB_EALG_DESCBC; return(ALG_ENC); }
3des-cbc { PREPROC; yylval.num = SADB_EALG_3DESCBC; return(ALG_ENC); }
simple { PREPROC; yylval.num = SADB_EALG_NULL; return(ALG_ENC); }
blowfish-cbc { PREPROC; yylval.num = SADB_EALG_BLOWFISHCBC; return(ALG_ENC); }
cast128-cbc { PREPROC; yylval.num = SADB_EALG_CAST128CBC; return(ALG_ENC); }
blowfish-cbc { PREPROC; yylval.num = SADB_X_EALG_BLOWFISHCBC; return(ALG_ENC); }
cast128-cbc { PREPROC; yylval.num = SADB_X_EALG_CAST128CBC; return(ALG_ENC); }
des-deriv { PREPROC; yylval.num = SADB_EALG_DESCBC; return(ALG_ENC_DESDERIV); }
des-32iv { PREPROC; yylval.num = SADB_EALG_DESCBC; return(ALG_ENC_DES32IV); }