summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2015-06-25 18:38:58 +0000
committergnn <gnn@FreeBSD.org>2015-06-25 18:38:58 +0000
commit2971c30634716e1361b9031cf6037d60ae9f9b97 (patch)
treeceed185ab01fe646f5817f2b138084de3dc909fd /sbin
parentba34261712beba1b38b13a3baf674a72e37e3b51 (diff)
downloadFreeBSD-src-2971c30634716e1361b9031cf6037d60ae9f9b97.zip
FreeBSD-src-2971c30634716e1361b9031cf6037d60ae9f9b97.tar.gz
Fix support for the null encryption algorithm which now requires
a key. Sponsored by: Rubicon Communications (Netgate)
Diffstat (limited to 'sbin')
-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