aboutsummaryrefslogtreecommitdiffstats
path: root/sbin/setkey
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2020-06-04 22:58:37 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2020-06-04 22:58:37 +0000
commit00a4311adc197c3518f5d60c69e00c4e80d065fd (patch)
treee98ea913365a77514ce06b11eb40d6bb00127ede /sbin/setkey
parent82785a3cc8034e10afdb59791699449f614726d2 (diff)
downloadsrc-00a4311adc197c3518f5d60c69e00c4e80d065fd.tar.gz
src-00a4311adc197c3518f5d60c69e00c4e80d065fd.zip
Refer to AES-CBC as "aes-cbc" rather than "rijndael-cbc" for IPsec.
At this point, AES is the more common name for Rijndael128. setkey(8) will still accept the old name, and old constants remain for compatiblity. Reviewed by: cem, bcr (manpages) MFC after: 2 weeks Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24964
Notes
Notes: svn path=/head/; revision=361810
Diffstat (limited to 'sbin/setkey')
-rw-r--r--sbin/setkey/setkey.84
-rw-r--r--sbin/setkey/token.l3
2 files changed, 4 insertions, 3 deletions
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 4d72a72fe89a..0d271b84792e 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 04, 2020
+.Dd June 4, 2020
.Dt SETKEY 8
.Os
.\"
@@ -612,7 +612,7 @@ parameter:
.Bd -literal -offset indent
algorithm keylen (bits) comment
null 0 to 2048 rfc2410
-rijndael-cbc 128/192/256 rfc3602
+aes-cbc 128/192/256 rfc3602
aes-ctr 160/224/288 rfc3686
aes-gcm-16 160/224/288 rfc4106
.Ed
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index 86d10fee4532..9a0cc9ea1915 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -159,7 +159,8 @@ tcp { yylval.num = 0; return(PR_TCP); }
{hyphen}E { BEGIN S_ENCALG; return(F_ENC); }
<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>rijndael-cbc { yylval.num = SADB_X_EALG_RIJNDAELCBC; BEGIN INITIAL; return(ALG_ENC); }
+<S_ENCALG>rijndael-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); }
+<S_ENCALG>aes-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); }
<S_ENCALG>aes-ctr { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC_SALT); }
<S_ENCALG>aes-gcm-16 { yylval.num = SADB_X_EALG_AESGCM16; BEGIN INITIAL; return(ALG_ENC_SALT); }