From 8dbfa91322fa1c756b1e3e3efe7fb41998e97bcc Mon Sep 17 00:00:00 2001
From: mikeb <mikeb@openbsd.org>
Date: Tue, 2 May 2017 17:08:30 +0000
Subject: [PATCH] Convert CMAC and Key Wrap regress tests over to the new AES

OK stsp@
---
 regress/sys/crypto/cmac/Makefile            | 4 ++--
 regress/sys/crypto/cmac/cmac_test.c         | 2 +-
 regress/sys/crypto/key_wrap/Makefile        | 4 ++--
 regress/sys/crypto/key_wrap/key_wrap_test.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/regress/sys/crypto/cmac/Makefile b/regress/sys/crypto/cmac/Makefile
index 28000f549d3..8a1267a57e0 100644
--- a/regress/sys/crypto/cmac/Makefile
+++ b/regress/sys/crypto/cmac/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.3 2014/01/18 05:54:52 martynas Exp $
+#	$OpenBSD: Makefile,v 1.4 2017/05/02 17:08:30 mikeb Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
 PROG=	cmac_test
-SRCS+=	rijndael.c cmac.c cmac_test.c
+SRCS+=	aes.c cmac.c cmac_test.c
 CDIAGFLAGS=	-Wall
 CDIAGFLAGS+=	-Werror
 CDIAGFLAGS+=	-Wpointer-arith
diff --git a/regress/sys/crypto/cmac/cmac_test.c b/regress/sys/crypto/cmac/cmac_test.c
index bd165f22f3d..0f5c8911c87 100644
--- a/regress/sys/crypto/cmac/cmac_test.c
+++ b/regress/sys/crypto/cmac/cmac_test.c
@@ -15,7 +15,7 @@
  */
 
 #include <sys/param.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
 #include <crypto/cmac.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/regress/sys/crypto/key_wrap/Makefile b/regress/sys/crypto/key_wrap/Makefile
index fd5549eb734..cd4f759e0a2 100644
--- a/regress/sys/crypto/key_wrap/Makefile
+++ b/regress/sys/crypto/key_wrap/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 2014/01/18 05:54:52 martynas Exp $
+#	$OpenBSD: Makefile,v 1.5 2017/05/02 17:08:30 mikeb Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
 PROG=	key_wrap_test
-SRCS+=	rijndael.c key_wrap.c key_wrap_test.c timingsafe_bcmp.c
+SRCS+=	aes.c key_wrap.c key_wrap_test.c timingsafe_bcmp.c
 CDIAGFLAGS=	-Wall
 CDIAGFLAGS+=	-Werror
 CDIAGFLAGS+=	-Wpointer-arith
diff --git a/regress/sys/crypto/key_wrap/key_wrap_test.c b/regress/sys/crypto/key_wrap/key_wrap_test.c
index 6a78aee01ae..5fc6006c6c7 100644
--- a/regress/sys/crypto/key_wrap/key_wrap_test.c
+++ b/regress/sys/crypto/key_wrap/key_wrap_test.c
@@ -16,7 +16,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
 #include <crypto/key_wrap.h>
 
 static void
-- 
2.20.1