svn commit: r367396 - in stable/12: lib/libipsec sbin/setkey sys/net usr.bin/netstat

[John Baldwin]

Author: jhb
Date: Thu Nov  5 19:37:56 2020
New Revision: 367396
URL: https://svnweb.freebsd.org/changeset/base/367396

Log:
  MFC 361810: 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.

Modified:
  stable/12/lib/libipsec/pfkey_dump.c
  stable/12/sbin/setkey/setkey.8
  stable/12/sbin/setkey/token.l
  stable/12/sys/net/pfkeyv2.h
  stable/12/usr.bin/netstat/ipsec.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/libipsec/pfkey_dump.c
==============================================================================
--- stable/12/lib/libipsec/pfkey_dump.c	Thu Nov  5 19:30:31 2020	(r367395)
+++ stable/12/lib/libipsec/pfkey_dump.c	Thu Nov  5 19:37:56 2020	(r367396)
@@ -181,8 +181,8 @@ static struct val2str str_alg_enc[] = {
 #endif
 	{ SADB_X_EALG_CAST128CBC, "cast128-cbc", },
 	{ SADB_X_EALG_BLOWFISHCBC, "blowfish-cbc", },
-#ifdef SADB_X_EALG_RIJNDAELCBC
-	{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", },
+#ifdef SADB_X_EALG_AESCBC
+	{ SADB_X_EALG_AESCBC, "aes-cbc", },
 #endif
 #ifdef SADB_X_EALG_TWOFISHCBC
 	{ SADB_X_EALG_TWOFISHCBC, "twofish-cbc", },

Modified: stable/12/sbin/setkey/setkey.8
==============================================================================
--- stable/12/sbin/setkey/setkey.8	Thu Nov  5 19:30:31 2020	(r367395)
+++ stable/12/sbin/setkey/setkey.8	Thu Nov  5 19:37:56 2020	(r367396)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 04, 2020
+.Dd June 4, 2020
 .Dt SETKEY 8
 .Os
 .\"
@@ -625,7 +625,7 @@ null		0 to 2048	rfc2410
 blowfish-cbc	40 to 448	rfc2451
 cast128-cbc	40 to 128	rfc2451
 des-deriv	64		ipsec-ciph-des-derived-01
-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
 camellia-cbc	128/192/256	rfc4312

Modified: stable/12/sbin/setkey/token.l
==============================================================================
--- stable/12/sbin/setkey/token.l	Thu Nov  5 19:30:31 2020	(r367395)
+++ stable/12/sbin/setkey/token.l	Thu Nov  5 19:37:56 2020	(r367396)
@@ -169,7 +169,8 @@ tcp		{ yylval.num = 0; return(PR_TCP); }
 <S_ENCALG>cast128-cbc	{ yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>des-deriv	{ yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DESDERIV); }
 <S_ENCALG>des-32iv	{ yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DES32IV); }
-<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>camellia-cbc	{ yylval.num = SADB_X_EALG_CAMELLIACBC; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>aes-gcm-16	{ yylval.num = SADB_X_EALG_AESGCM16; BEGIN INITIAL; return(ALG_ENC_SALT); }

Modified: stable/12/sys/net/pfkeyv2.h
==============================================================================
--- stable/12/sys/net/pfkeyv2.h	Thu Nov  5 19:30:31 2020	(r367395)
+++ stable/12/sys/net/pfkeyv2.h	Thu Nov  5 19:37:56 2020	(r367396)
@@ -383,6 +383,7 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, "
 #define SADB_EALG_NULL		11
 #define SADB_X_EALG_RIJNDAELCBC	12
 #define SADB_X_EALG_AES		12
+#define	SADB_X_EALG_AESCBC	12
 #define SADB_X_EALG_AESCTR	13
 #define SADB_X_EALG_AESGCM8	18	/* RFC4106 */
 #define SADB_X_EALG_AESGCM12	19

Modified: stable/12/usr.bin/netstat/ipsec.c
==============================================================================
--- stable/12/usr.bin/netstat/ipsec.c	Thu Nov  5 19:30:31 2020	(r367395)
+++ stable/12/usr.bin/netstat/ipsec.c	Thu Nov  5 19:37:56 2020	(r367396)
@@ -147,7 +147,7 @@ static struct val2str ipsec_espnames[] = {
 	{ SADB_EALG_NULL, "null", },
 	{ SADB_X_EALG_CAST128CBC, "cast128-cbc", },
 	{ SADB_X_EALG_BLOWFISHCBC, "blowfish-cbc", },
-	{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", },
+	{ SADB_X_EALG_AESCBC, "aes-cbc", },
 	{ SADB_X_EALG_CAMELLIACBC, "camellia-cbc", },
 	{ SADB_X_EALG_AESCTR, "aes-ctr", },
 	{ SADB_X_EALG_AESGCM16, "aes-gcm-16", },