Convert CMAC and Key Wrap regress tests over to the new AES

OK stsp@

diff --git a/regress/sys/crypto/cmac/Makefile b/regress/sys/crypto/cmac/Makefile
index 28000f5..8a1267a 100644 (file)
--- 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 bd165f2..0f5c891 100644 (file)
--- 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 fd5549e..cd4f759 100644 (file)
--- 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 6a78aee..5fc6006 100644 (file)
--- 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