Date: Thu, 25 Jun 2015 18:38:59 +0000 (UTC) From: "George V. Neville-Neil" <gnn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284816 - head/sbin/setkey Message-ID: <201506251838.t5PIcxHI041785@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506251838.t5PIcxHI041785>