Module Name: src
Committed By: riastradh
Date: Tue Jun 30 04:14:56 UTC 2020
Modified Files:
src/sys/netipsec: files.netipsec xform_esp.c
src/sys/opencrypto: cryptodev.c cryptosoft_xform.c xform.c xform.h
Log Message:
Rename enc_xform_rijndael128 -> enc_xform_aes.
Update netipsec dependency.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/netipsec/files.netipsec
cvs rdiff -u -r1.99 -r1.100 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.105 -r1.106 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.29 -r1.30 src/sys/opencrypto/cryptosoft_xform.c
cvs rdiff -u -r1.30 -r1.31 src/sys/opencrypto/xform.c
cvs rdiff -u -r1.20 -r1.21 src/sys/opencrypto/xform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/files.netipsec
diff -u src/sys/netipsec/files.netipsec:1.14 src/sys/netipsec/files.netipsec:1.15
--- src/sys/netipsec/files.netipsec:1.14 Wed Apr 22 09:15:40 2020
+++ src/sys/netipsec/files.netipsec Tue Jun 30 04:14:55 2020
@@ -1,7 +1,7 @@
-# $Id: files.netipsec,v 1.14 2020/04/22 09:15:40 rin Exp $
+# $Id: files.netipsec,v 1.15 2020/06/30 04:14:55 riastradh Exp $
#
#
-defflag opt_ipsec.h IPSEC: opencrypto, rijndael
+defflag opt_ipsec.h IPSEC: opencrypto, aes
defflag opt_ipsec.h IPSEC_DEBUG
defflag opt_ipsec.h IPSEC_TX_TOS_CLEAR
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.99 src/sys/netipsec/xform_esp.c:1.100
--- src/sys/netipsec/xform_esp.c:1.99 Fri Nov 1 04:23:21 2019
+++ src/sys/netipsec/xform_esp.c Tue Jun 30 04:14:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.99 2019/11/01 04:23:21 knakahara Exp $ */
+/* $NetBSD: xform_esp.c,v 1.100 2020/06/30 04:14:55 riastradh Exp $ */
/* $FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.99 2019/11/01 04:23:21 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.100 2020/06/30 04:14:55 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -112,7 +112,7 @@ esp_algorithm_lookup(int alg)
case SADB_EALG_3DESCBC:
return &enc_xform_3des;
case SADB_X_EALG_AES:
- return &enc_xform_rijndael128;
+ return &enc_xform_aes;
case SADB_X_EALG_BLOWFISHCBC:
return &enc_xform_blf;
case SADB_X_EALG_CAST128CBC:
@@ -1061,7 +1061,7 @@ esp_attach(void)
esp_max_ivlen = 0;
MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */
MAXIV(enc_xform_3des); /* SADB_EALG_3DESCBC */
- MAXIV(enc_xform_rijndael128); /* SADB_X_EALG_AES */
+ MAXIV(enc_xform_aes); /* SADB_X_EALG_AES */
MAXIV(enc_xform_blf); /* SADB_X_EALG_BLOWFISHCBC */
MAXIV(enc_xform_cast5); /* SADB_X_EALG_CAST128CBC */
MAXIV(enc_xform_skipjack); /* SADB_X_EALG_SKIPJACK */
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.105 src/sys/opencrypto/cryptodev.c:1.106
--- src/sys/opencrypto/cryptodev.c:1.105 Mon Apr 13 00:27:17 2020
+++ src/sys/opencrypto/cryptodev.c Tue Jun 30 04:14:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.105 2020/04/13 00:27:17 chs Exp $ */
+/* $NetBSD: cryptodev.c,v 1.106 2020/06/30 04:14:55 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.105 2020/04/13 00:27:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.106 2020/06/30 04:14:55 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1576,7 +1576,7 @@ cryptodev_session(struct fcrypt *fcr, st
txform = &enc_xform_skipjack;
break;
case CRYPTO_AES_CBC:
- txform = &enc_xform_rijndael128;
+ txform = &enc_xform_aes;
break;
case CRYPTO_CAMELLIA_CBC:
txform = &enc_xform_camellia;
Index: src/sys/opencrypto/cryptosoft_xform.c
diff -u src/sys/opencrypto/cryptosoft_xform.c:1.29 src/sys/opencrypto/cryptosoft_xform.c:1.30
--- src/sys/opencrypto/cryptosoft_xform.c:1.29 Mon Jun 29 23:34:48 2020
+++ src/sys/opencrypto/cryptosoft_xform.c Tue Jun 30 04:14:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft_xform.c,v 1.29 2020/06/29 23:34:48 riastradh Exp $ */
+/* $NetBSD: cryptosoft_xform.c,v 1.30 2020/06/30 04:14:55 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: xform.c,v 1.19 2002/08/16 22:47:25 dhartmei Exp $ */
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cryptosoft_xform.c,v 1.29 2020/06/29 23:34:48 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cryptosoft_xform.c,v 1.30 2020/06/30 04:14:55 riastradh Exp $");
#include <sys/cprng.h>
#include <sys/kmem.h>
@@ -206,7 +206,7 @@ static const struct swcr_enc_xform swcr_
};
static const struct swcr_enc_xform swcr_enc_xform_aes = {
- &enc_xform_rijndael128,
+ &enc_xform_aes,
aes_encrypt,
aes_decrypt,
aes_setkey,
Index: src/sys/opencrypto/xform.c
diff -u src/sys/opencrypto/xform.c:1.30 src/sys/opencrypto/xform.c:1.31
--- src/sys/opencrypto/xform.c:1.30 Mon Jun 29 23:34:48 2020
+++ src/sys/opencrypto/xform.c Tue Jun 30 04:14:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xform.c,v 1.30 2020/06/29 23:34:48 riastradh Exp $ */
+/* $NetBSD: xform.c,v 1.31 2020/06/30 04:14:56 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: xform.c,v 1.19 2002/08/16 22:47:25 dhartmei Exp $ */
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform.c,v 1.30 2020/06/29 23:34:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform.c,v 1.31 2020/06/30 04:14:56 riastradh Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -144,7 +144,7 @@ const struct enc_xform enc_xform_skipjac
.maxkey = 10,
};
-const struct enc_xform enc_xform_rijndael128 = {
+const struct enc_xform enc_xform_aes = {
.type = CRYPTO_AES_CBC,
.name = "AES",
.blocksize = 16,
Index: src/sys/opencrypto/xform.h
diff -u src/sys/opencrypto/xform.h:1.20 src/sys/opencrypto/xform.h:1.21
--- src/sys/opencrypto/xform.h:1.20 Thu Jul 6 08:22:45 2017
+++ src/sys/opencrypto/xform.h Tue Jun 30 04:14:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xform.h,v 1.20 2017/07/06 08:22:45 ozaki-r Exp $ */
+/* $NetBSD: xform.h,v 1.21 2020/06/30 04:14:56 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/xform.h,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: xform.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $ */
@@ -63,7 +63,7 @@ extern const struct enc_xform enc_xform_
extern const struct enc_xform enc_xform_blf;
extern const struct enc_xform enc_xform_cast5;
extern const struct enc_xform enc_xform_skipjack;
-extern const struct enc_xform enc_xform_rijndael128;
+extern const struct enc_xform enc_xform_aes;
extern const struct enc_xform enc_xform_arc4;
extern const struct enc_xform enc_xform_camellia;
extern const struct enc_xform enc_xform_aes_ctr;
