Small regress test fixups.
---
regress/sys/crypto/aesctr/Makefile | 2 +-
regress/sys/crypto/aesctr/aesctr.c | 8 +++-----
regress/sys/crypto/aesxts/Makefile | 2 +-
regress/sys/crypto/aesxts/aes_xts.c | 6 +++---
regress/sys/crypto/gmac/Makefile | 2 +-
regress/sys/crypto/gmac/gmac_test.c | 2 +-
6 files changed, 10 insertions(+), 12 deletions(-)
diff --git regress/sys/crypto/aesctr/Makefile regress/sys/crypto/aesctr/Makefile
index b1417864a2e..6c3dc3f9145 100644
--- regress/sys/crypto/aesctr/Makefile
+++ regress/sys/crypto/aesctr/Makefile
@@ -18,11 +18,11 @@ CDIAGFLAGS+= -Wsign-compare
CDIAGFLAGS+= -Wshadow
REGRESS_ROOT_TARGETS= run-regress-${PROG}
.PATH: ${DIR}/crypto
-SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c rijndael.c set_key.c
+SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c aes.c set_key.c
SRCS+= chachapoly.c poly1305.c
SRCS+= xform.c
run-regress-${PROG}: ${PROG}
./${PROG}
diff --git regress/sys/crypto/aesctr/aesctr.c regress/sys/crypto/aesctr/aesctr.c
index a7107331a8d..9b73993bbab 100644
--- regress/sys/crypto/aesctr/aesctr.c
+++ regress/sys/crypto/aesctr/aesctr.c
@@ -15,11 +15,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 <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -149,13 +149,12 @@ explicit_bzero(void *b, size_t len)
#define AESCTR_NONCESIZE 4
#define AESCTR_IVSIZE 8
#define AESCTR_BLOCKSIZE 16
struct aes_ctr_ctx {
- u_int32_t ac_ek[4*(AES_MAXROUNDS + 1)];
+ AES_CTX ac_key;
u_int8_t ac_block[AESCTR_BLOCKSIZE];
- int ac_nr;
};
int aes_ctr_setkey(void *, u_int8_t *, int);
void aes_ctr_encrypt(caddr_t, u_int8_t *);
void aes_ctr_decrypt(caddr_t, u_int8_t *);
@@ -180,11 +179,10 @@ docrypt(const unsigned char *key, size_t klen, const
unsigned char *iv,
aes_ctr_crypt(&ctx, block);
bcopy(block, out, AESCTR_BLOCKSIZE);
out += AESCTR_BLOCKSIZE;
}
return 0;
-
}
static int
match(unsigned char *a, unsigned char *b, size_t len)
{
@@ -240,11 +238,11 @@ run(int num)
return (1);
}
if (docrypt(data[TST_KEY], length[TST_KEY],
data[TST_IV], data[TST_PLAIN], p,
length[TST_PLAIN], 0) < 0) {
- warnx("crypt with /dev/crypto failed");
+ warnx("encryption failed");
goto done;
}
fail = !match(data[TST_CIPHER], p, len);
printf("%s test vector %d\n", fail ? "FAILED" : "OK", num);
done:
diff --git regress/sys/crypto/aesxts/Makefile regress/sys/crypto/aesxts/Makefile
index 4e1040c536a..bd3bc595c8d 100644
--- regress/sys/crypto/aesxts/Makefile
+++ regress/sys/crypto/aesxts/Makefile
@@ -18,11 +18,11 @@ CDIAGFLAGS+= -Wsign-compare
CDIAGFLAGS+= -Wshadow
REGRESS_TARGETS= run-regress-${PROG}
.PATH: ${DIR}/crypto
-SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c rijndael.c set_key.c
+SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c aes.c set_key.c
SRCS+= chachapoly.c poly1305.c
SRCS+= xform.c
run-regress-${PROG}: ${PROG}
./${PROG}
diff --git regress/sys/crypto/aesxts/aes_xts.c
regress/sys/crypto/aesxts/aes_xts.c
index 77a64108498..543eaceec87 100644
--- regress/sys/crypto/aesxts/aes_xts.c
+++ regress/sys/crypto/aesxts/aes_xts.c
@@ -24,23 +24,23 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/types.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define AES_XTS_BLOCKSIZE 16
struct aes_xts_ctx {
- rijndael_ctx key1;
- rijndael_ctx key2;
+ AES_CTX key1;
+ AES_CTX key2;
u_int8_t tweak[AES_XTS_BLOCKSIZE];
};
int aes_xts_setkey(void *, u_int8_t *, int);
void aes_xts_encrypt(caddr_t, u_int8_t *);
diff --git regress/sys/crypto/gmac/Makefile regress/sys/crypto/gmac/Makefile
index 9e687f53e20..edb3c10d7c5 100644
--- regress/sys/crypto/gmac/Makefile
+++ regress/sys/crypto/gmac/Makefile
@@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2014/01/18 05:54:52 martynas Exp $
DIR=${.CURDIR}/../../../../sys
PROG= gmac_test
-SRCS+= rijndael.c gmac.c gmac_test.c
+SRCS+= aes.c gmac.c gmac_test.c
CDIAGFLAGS= -Wall
CDIAGFLAGS+= -Werror
CDIAGFLAGS+= -Wpointer-arith
CDIAGFLAGS+= -Wno-uninitialized
CDIAGFLAGS+= -Wstrict-prototypes
diff --git regress/sys/crypto/gmac/gmac_test.c
regress/sys/crypto/gmac/gmac_test.c
index 90732976d34..8717de81cb1 100644
--- regress/sys/crypto/gmac/gmac_test.c
+++ regress/sys/crypto/gmac/gmac_test.c
@@ -16,11 +16,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/gmac.h>
#include <err.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
--
2.12.2
