summaryrefslogtreecommitdiffstats
path: root/sbin/setkey/token.l
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2015-09-15 16:00:51 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2015-10-20 12:04:58 -0500
commitd85aff53b0c0e63014bd989f48f567f44ca52ce9 (patch)
treeb593e38194f057f735bfb49d9af761aaa0f9fb26 /sbin/setkey/token.l
parent3aa465ad9e65f5198257241a71eaa0a55929ba64 (diff)
downloadFreeBSD-src-d85aff53b0c0e63014bd989f48f567f44ca52ce9.zip
FreeBSD-src-d85aff53b0c0e63014bd989f48f567f44ca52ce9.tar.gz
MFC r284816:
Fix support for the null encryption algorithm which now requires a key. Sponsored by: Rubicon Communications (Netgate) TAG: IPSEC-HEAD Issue: #4841
Diffstat (limited to 'sbin/setkey/token.l')
-rw-r--r--sbin/setkey/token.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index c89982f..bc9205b 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -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); }
OpenPOWER on IntegriCloud