From owner-svn-src-all@freebsd.org Thu Nov 5 19:37:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1570946F43F; Thu, 5 Nov 2020 19:37:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CRv1y04Qjz3KL7; Thu, 5 Nov 2020 19:37:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4F5118E9C; Thu, 5 Nov 2020 19:37:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A5Jbvli002355; Thu, 5 Nov 2020 19:37:57 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A5JbvH6002351; Thu, 5 Nov 2020 19:37:57 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202011051937.0A5JbvH6002351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 5 Nov 2020 19:37:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r367396 - in stable/12: lib/libipsec sbin/setkey sys/net usr.bin/netstat X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable/12: lib/libipsec sbin/setkey sys/net usr.bin/netstat X-SVN-Commit-Revision: 367396 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2020 19:37:58 -0000 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); } cast128-cbc { yylval.num = SADB_X_EALG_CAST128CBC; BEGIN INITIAL; return(ALG_ENC); } des-deriv { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DESDERIV); } des-32iv { yylval.num = SADB_EALG_DESCBC; BEGIN INITIAL; return(ALG_ENC_DES32IV); } -rijndael-cbc { yylval.num = SADB_X_EALG_RIJNDAELCBC; BEGIN INITIAL; return(ALG_ENC); } +rijndael-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); } +aes-cbc { yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); } aes-ctr { yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC_SALT); } camellia-cbc { yylval.num = SADB_X_EALG_CAMELLIACBC; BEGIN INITIAL; return(ALG_ENC); } 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", },