From owner-svn-src-all@freebsd.org  Thu Jun 25 18:38:59 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 513A798CA33;
 Thu, 25 Jun 2015 18:38:59 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4258D1B12;
 Thu, 25 Jun 2015 18:38:59 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PIcxVC041786;
 Thu, 25 Jun 2015 18:38:59 GMT (envelope-from gnn@FreeBSD.org)
Received: (from gnn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PIcxHI041785;
 Thu, 25 Jun 2015 18:38:59 GMT (envelope-from gnn@FreeBSD.org)
Message-Id: <201506251838.t5PIcxHI041785@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gnn set sender to gnn@FreeBSD.org
 using -f
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Thu, 25 Jun 2015 18:38:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284816 - head/sbin/setkey
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2015 18:38:59 -0000

Author: gnn
Date: Thu Jun 25 18:38:58 2015
New Revision: 284816
URL: https://svnweb.freebsd.org/changeset/base/284816

Log:
  Fix support for the null encryption algorithm which now requires
  a key.
  
  Sponsored by: Rubicon Communications (Netgate)

Modified:
  head/sbin/setkey/token.l

Modified: head/sbin/setkey/token.l
==============================================================================
--- head/sbin/setkey/token.l	Thu Jun 25 16:47:11 2015	(r284815)
+++ head/sbin/setkey/token.l	Thu Jun 25 18:38:58 2015	(r284816)
@@ -159,7 +159,7 @@ tcp		{ yylval.num = 0; return(PR_TCP); }
 {hyphen}E	{ BEGIN S_ENCALG; return(F_ENC); }
 <S_ENCALG>des-cbc	{ yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>3des-cbc	{ yylval.num = SADB_EALG_3DESCBC; BEGIN INITIAL; return(ALG_ENC); }
-<S_ENCALG>null		{ yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_NOKEY); }
+<S_ENCALG>null		{ yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>simple	{ yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); }
 <S_ENCALG>blowfish-cbc	{ yylval.num = SADB_X_EALG_BLOWFISHCBC; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>cast128-cbc	{ yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); }