[src/netbsd-1-5]: src/sbin/setkey pullup 1.1 -> 1.2 (approved by releng-1-5)

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b9d818a44d8
branches:  netbsd-1-5
changeset: 488698:4b9d818a44d8
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Jul 25 04:26:15 2000 +0000

description:
pullup 1.1 -> 1.2 (approved by releng-1-5)
sync with recent net/pfkeyv2.h change (sorry forgot to commit). from kame

diffstat:

 sbin/setkey/parse.y |   6 +++---
 sbin/setkey/token.l |  14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r cf4a40cbf209 -r 4b9d818a44d8 sbin/setkey/parse.y
--- a/sbin/setkey/parse.y       Tue Jul 25 04:24:45 2000 +0000
+++ b/sbin/setkey/parse.y       Tue Jul 25 04:26:15 2000 +0000
@@ -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.1.2.1 2000/07/25 04:26:15 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_key
        :       /*NOTHING*/
                {
-                       if (p_alg_auth != SADB_AALG_NULL) {
+                       if (p_alg_auth != SADB_X_AALG_NULL) {
                                yyerror("no key found.");
                                return -1;
                        }
diff -r cf4a40cbf209 -r 4b9d818a44d8 sbin/setkey/token.l
--- a/sbin/setkey/token.l       Tue Jul 25 04:24:45 2000 +0000
+++ b/sbin/setkey/token.l       Tue Jul 25 04:26:15 2000 +0000
@@ -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.1.2.1 2000/07/25 04:26:15 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 @@
 {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); }