summaryrefslogtreecommitdiff
path: root/sys/opencrypto
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2020-06-30 04:14:55 +0000
committerriastradh <riastradh@NetBSD.org>2020-06-30 04:14:55 +0000
commit1c8e0458d983bc2403c63242dcece4d32e4ac940 (patch)
treee2886aa5c34c24c3df4f9ce0a5f8104e8f52c04a /sys/opencrypto
parent53707435a3cf1f865cddaaf524bd9206413a2d4f (diff)
Rename enc_xform_rijndael128 -> enc_xform_aes.
Update netipsec dependency.
Diffstat (limited to 'sys/opencrypto')
-rw-r--r--sys/opencrypto/cryptodev.c6
-rw-r--r--sys/opencrypto/cryptosoft_xform.c6
-rw-r--r--sys/opencrypto/xform.c6
-rw-r--r--sys/opencrypto/xform.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 5f65e13d25c..4060d3643e6 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -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, struct session_op *sop)
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;
diff --git a/sys/opencrypto/cryptosoft_xform.c b/sys/opencrypto/cryptosoft_xform.c
index f86a5b0611a..563c757e04a 100644
--- a/sys/opencrypto/cryptosoft_xform.c
+++ b/sys/opencrypto/cryptosoft_xform.c
@@ -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_enc_xform_skipjack = {
};
static const struct swcr_enc_xform swcr_enc_xform_aes = {
- &enc_xform_rijndael128,
+ &enc_xform_aes,
aes_encrypt,
aes_decrypt,
aes_setkey,
diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c
index 78b927c7a3b..2bc7d1995ec 100644
--- a/sys/opencrypto/xform.c
+++ b/sys/opencrypto/xform.c
@@ -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_skipjack = {
.maxkey = 10,
};
-const struct enc_xform enc_xform_rijndael128 = {
+const struct enc_xform enc_xform_aes = {
.type = CRYPTO_AES_CBC,
.name = "AES",
.blocksize = 16,
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h
index 2b64d6d259b..f9d43713c6f 100644
--- a/sys/opencrypto/xform.h
+++ b/sys/opencrypto/xform.h
@@ -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_3des;
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;