diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2017-05-02 17:08:31 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2017-05-02 17:08:31 +0000 |
| commit | 7c15c4c2e88159c4c17391d56cf8d2ef87830631 (patch) | |
| tree | 16cb29d81b8eec49e68c8ea05fe33357cec654d3 /regress/sys | |
| parent | 52326288ebfd46c98ecd5c376931909af50ccbcd (diff) | |
Convert CMAC and Key Wrap regress tests over to the new AES
OK stsp@
Diffstat (limited to 'regress/sys')
| -rw-r--r-- | regress/sys/crypto/cmac/Makefile | 4 | ||||
| -rw-r--r-- | regress/sys/crypto/cmac/cmac_test.c | 2 | ||||
| -rw-r--r-- | regress/sys/crypto/key_wrap/Makefile | 4 | ||||
| -rw-r--r-- | 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 |