[PATCH 02/04] Adjust AES testcase to the new implementation

[Mike Belopuhov]

Adjusts the regress test.

---
 regress/sys/crypto/aes/Makefile  |  2 +-
 regress/sys/crypto/aes/aestest.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git regress/sys/crypto/aes/Makefile regress/sys/crypto/aes/Makefile
index 75e88b1a7a6..9120371a07d 100644
--- regress/sys/crypto/aes/Makefile
+++ regress/sys/crypto/aes/Makefile
@@ -17,11 +17,11 @@ CDIAGFLAGS+=        -Wsign-compare
 CDIAGFLAGS+=   -Wshadow
 
 REGRESS_ROOT_TARGETS=  run-regress-${PROG}
 
 .PATH: ${DIR}/crypto
-SRCS+= rijndael.c
+SRCS+= aes.c
 
 run-regress-${PROG}: ${PROG}
        ./${PROG} ${.CURDIR}/vectors/*.txt
 
 .include <bsd.regress.mk>
diff --git regress/sys/crypto/aes/aestest.c regress/sys/crypto/aes/aestest.c
index f51be2a2665..489ac404e45 100644
--- regress/sys/crypto/aes/aestest.c
+++ regress/sys/crypto/aes/aestest.c
@@ -29,11 +29,11 @@
  * Test kernel AES implementation with test vectors provided by
  * Dr Brian Gladman:  http://fp.gladman.plus.com/AES/
  */
 
 #include <sys/param.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -41,21 +41,21 @@
 
 static int
 docrypt(const unsigned char *key, size_t klen, const unsigned char *in,
     unsigned char *out, size_t len, int do_encrypt)
 {
-       rijndael_ctx ctx;
+       AES_CTX ctx;
        int error = 0;
 
        memset(&ctx, 0, sizeof(ctx));
-       error = rijndael_set_key(&ctx, key, klen * 8);
+       error = AES_Setkey(&ctx, key, klen);
        if (error)
                return -1;
        if (do_encrypt)
-               rijndael_encrypt(&ctx, in, out);
+               AES_Encrypt(&ctx, in, out);
        else
-               rijndael_decrypt(&ctx, in, out);
+               AES_Decrypt(&ctx, in, out);
        return 0;
 }
 
 static int
 match(unsigned char *a, unsigned char *b, size_t len)
-- 
2.12.2