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

[Mike Belopuhov]

OK?

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

diff --git regress/sys/crypto/cmac/Makefile regress/sys/crypto/cmac/Makefile
index 28000f549d3..d26ca3f2f75 100644
--- regress/sys/crypto/cmac/Makefile
+++ regress/sys/crypto/cmac/Makefile
@@ -1,11 +1,11 @@
 #      $OpenBSD: Makefile,v 1.3 2014/01/18 05:54:52 martynas 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
 CDIAGFLAGS+=   -Wno-uninitialized
 CDIAGFLAGS+=   -Wstrict-prototypes
diff --git regress/sys/crypto/cmac/cmac_test.c 
regress/sys/crypto/cmac/cmac_test.c
index bd165f22f3d..0f5c8911c87 100644
--- regress/sys/crypto/cmac/cmac_test.c
+++ regress/sys/crypto/cmac/cmac_test.c
@@ -13,11 +13,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/param.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
 #include <crypto/cmac.h>
 #include <stdio.h>
 #include <string.h>
 
 static void
diff --git regress/sys/crypto/key_wrap/Makefile 
regress/sys/crypto/key_wrap/Makefile
index fd5549eb734..35cdd268ea1 100644
--- regress/sys/crypto/key_wrap/Makefile
+++ regress/sys/crypto/key_wrap/Makefile
@@ -1,11 +1,11 @@
 #      $OpenBSD: Makefile,v 1.4 2014/01/18 05:54:52 martynas 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
 CDIAGFLAGS+=   -Wno-uninitialized
 CDIAGFLAGS+=   -Wstrict-prototypes
diff --git regress/sys/crypto/key_wrap/key_wrap_test.c 
regress/sys/crypto/key_wrap/key_wrap_test.c
index 6a78aee01ae..5fc6006c6c7 100644
--- regress/sys/crypto/key_wrap/key_wrap_test.c
+++ regress/sys/crypto/key_wrap/key_wrap_test.c
@@ -14,11 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <string.h>
 #include <stdio.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
 #include <crypto/key_wrap.h>
 
 static void
 print_hex(const char *str, unsigned char *buf, int len)
 {
-- 
2.12.2