d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refer to AES-CBC as "aes-cbc" rather than "rijndael-cbc" for IPsec.

Browse Source 
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
This commit is contained in:
John Baldwin 2020-06-04 22:58:37 +00:00
parent 82785a3cc8
commit 00a4311adc
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libipsec/pfkey_dump.c
View File

@ -159,8 +159,8 @@ static struct val2str str_alg_enc[] = {
#ifdef SADB_X_EALG_RC5CBC #ifdef SADB_X_EALG_RC5CBC
{ SADB_X_EALG_RC5CBC, "rc5-cbc", }, { SADB_X_EALG_RC5CBC, "rc5-cbc", },
#endif #endif
#ifdef SADB_X_EALG_RIJNDAELCBC #ifdef SADB_X_EALG_AESCBC
{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", }, { SADB_X_EALG_AESCBC, "aes-cbc", },
#endif #endif
#ifdef SADB_X_EALG_TWOFISHCBC #ifdef SADB_X_EALG_TWOFISHCBC
{ SADB_X_EALG_TWOFISHCBC, "twofish-cbc", }, { SADB_X_EALG_TWOFISHCBC, "twofish-cbc", },

4
sbin/setkey/setkey.8
View File

@ -29,7 +29,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd May 04, 2020 .Dd June 4, 2020
.Dt SETKEY 8 .Dt SETKEY 8
.Os .Os
.\" .\"
@ -612,7 +612,7 @@ parameter:
.Bd -literal -offset indent .Bd -literal -offset indent
algorithm keylen (bits) comment algorithm keylen (bits) comment
null 0 to 2048 rfc2410 null 0 to 2048 rfc2410
rijndael-cbc 128/192/256 rfc3602 aes-cbc 128/192/256 rfc3602
aes-ctr 160/224/288 rfc3686 aes-ctr 160/224/288 rfc3686
aes-gcm-16 160/224/288 rfc4106 aes-gcm-16 160/224/288 rfc4106
.Ed .Ed

3
sbin/setkey/token.l
View File

@ -159,7 +159,8 @@ tcp { yylval.num = 0; return(PR_TCP); }
{hyphen}E { BEGIN S_ENCALG; return(F_ENC); } {hyphen}E { BEGIN S_ENCALG; return(F_ENC); }
<S_ENCALG>null { yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_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>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-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); } <S_ENCALG>aes-gcm-16 { yylval.num = SADB_X_EALG_AESGCM16; BEGIN INITIAL; return(ALG_ENC_SALT); }

1
sys/net/pfkeyv2.h
View File

@ -383,6 +383,7 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, "struct size mismatch");
#define SADB_EALG_NULL 11 #define SADB_EALG_NULL 11
#define SADB_X_EALG_RIJNDAELCBC 12 #define SADB_X_EALG_RIJNDAELCBC 12
#define SADB_X_EALG_AES 12 #define SADB_X_EALG_AES 12
#define SADB_X_EALG_AESCBC 12
#define SADB_X_EALG_AESCTR 13 #define SADB_X_EALG_AESCTR 13
#define SADB_X_EALG_AESGCM8 18 /* RFC4106 */ #define SADB_X_EALG_AESGCM8 18 /* RFC4106 */
#define SADB_X_EALG_AESGCM12 19 #define SADB_X_EALG_AESGCM12 19

2
usr.bin/netstat/ipsec.c
View File

@ -139,7 +139,7 @@ static struct val2str ipsec_ahnames[] = {
static struct val2str ipsec_espnames[] = { static struct val2str ipsec_espnames[] = {
{ SADB_EALG_NONE, "none", }, { SADB_EALG_NONE, "none", },
{ SADB_EALG_NULL, "null", }, { SADB_EALG_NULL, "null", },
{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", }, { SADB_X_EALG_AESCBC, "aes-cbc", },
{ SADB_X_EALG_AESCTR, "aes-ctr", }, { SADB_X_EALG_AESCTR, "aes-ctr", },
{ SADB_X_EALG_AESGCM16, "aes-gcm-16", }, { SADB_X_EALG_AESGCM16, "aes-gcm-16", },
{ SADB_X_EALG_AESGMAC, "aes-gmac", }, { SADB_X_EALG_AESGMAC, "aes-gmac", },