From owner-freebsd-bugs@FreeBSD.ORG Mon Jan 26 21:50:38 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23E6316A4EA for ; Mon, 26 Jan 2004 21:50:38 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF2C043D4C for ; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0R5oBFR028804 for ; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0R5oBNf028803; Mon, 26 Jan 2004 21:50:11 -0800 (PST) (envelope-from gnats) Resent-Date: Mon, 26 Jan 2004 21:50:11 -0800 (PST) Resent-Message-Id: <200401270550.i0R5oBNf028803@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xin LI Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8137D16A54F; Mon, 26 Jan 2004 21:47:57 -0800 (PST) Received: from ftp.bjpu.edu.cn (ftp.bjpu.edu.cn [202.112.78.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1385C4408A; Mon, 26 Jan 2004 19:49:36 -0800 (PST) (envelope-from delphij@frontfree.net) Received: by ftp.bjpu.edu.cn (Postfix, from userid 426) id DE4515358; Tue, 27 Jan 2004 10:44:26 +0800 (CST) Received: from beastie.frontfree.net (beastie.frontfree.net [218.107.145.7]) by ftp.bjpu.edu.cn (Postfix) with ESMTP id BC9565299; Tue, 27 Jan 2004 10:44:26 +0800 (CST) Received: by beastie.frontfree.net (Postfix, from userid 1001) id 752F211BA4; Tue, 27 Jan 2004 10:44:25 +0800 (CST) Message-Id: <20040127024425.752F211BA4@beastie.frontfree.net> Date: Tue, 27 Jan 2004 10:44:25 +0800 (CST) From: Xin LI To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ume@FreeBSD.org Subject: bin/61978: [PATCH] sync src/usr.sbin/setkey/token.l with KAME X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Xin LI List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jan 2004 05:50:38 -0000 >Number: 61978 >Category: bin >Synopsis: [PATCH] sync src/usr.sbin/setkey/token.l with KAME >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 26 21:50:11 PST 2004 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 5.2-RELEASE i386 >Organization: The FreeBSD Simplified Chinese Project >Environment: System: FreeBSD beastie.frontfree.net 5.2-RELEASE FreeBSD 5.2-RELEASE #16: Sat Jan 10 15:24:09 CST 2004 delphij@beastie.frontfree.net:/usr/obj/usr/src/sys/BEASTIE i386 >Description: Merge KAME's rev. 1.44-1.45 of setkey/token.l >How-To-Repeat: >Fix: Apply the attached patch. Please note that NetBSD-specific and *BSD cross compile support was removed from this merge to reduce the diff. twofish-cbc is not implemented in FreeBSD and was not included in this patch. --- patch begins here --- --- token.l.orig Wed Nov 5 17:47:54 2003 +++ token.l Tue Jan 27 10:36:13 2004 @@ -1,5 +1,5 @@ -/* $FreeBSD: src/usr.sbin/setkey/token.l,v 1.9 2003/11/05 09:47:54 ume Exp $ */ -/* $KAME: token.l,v 1.43 2003/07/25 09:35:28 itojun Exp $ */ +/* $FreeBSD$ */ +/* $KAME: token.l,v 1.45 2004/01/08 06:01:03 sakane Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. @@ -110,7 +110,7 @@ /* count up for nl */ { char *p; - for (p = yytext; *p != NULL; p++) + for (p = yytext; *p != 0; p++) if (*p == '\n') lineno++; } @@ -151,13 +151,13 @@ hmac-sha2-512 { yylval.num = SADB_X_AALG_SHA2_512; BEGIN INITIAL; return(ALG_AUTH); } hmac-ripemd160 { yylval.num = SADB_X_AALG_RIPEMD160HMAC; BEGIN INITIAL; return(ALG_AUTH); } aes-xcbc-mac { yylval.num = SADB_X_AALG_AES_XCBC_MAC; BEGIN INITIAL; return(ALG_AUTH); } -null { yylval.num = SADB_X_AALG_NULL; BEGIN INITIAL; return(ALG_AUTH_NOKEY); } +null { yylval.num = SADB_X_AALG_NULL; BEGIN INITIAL; return(ALG_AUTH); } /* encryption alogorithm */ {hyphen}E { BEGIN S_ENCALG; return(F_ENC); } des-cbc { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC); } 3des-cbc { yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL; return(ALG_ENC); } -null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_NOKEY); } +null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC); } simple { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); } blowfish-cbc { yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL; return(ALG_ENC); } cast128-cbc { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); } @@ -219,7 +219,7 @@ {quotedstring} { char *p = yytext; while (*++p != '"') ; - *p = NULL; + *p = 0; yytext++; yylval.val.len = yyleng - 2; yylval.val.buf = strdup(yytext); --- patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: