diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2018-04-09 04:34:57 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2018-04-09 04:34:57 +0000 |
| commit | 3586fa848c7b3df684c463a0243f9452d0317424 (patch) | |
| tree | d2f40f5ef38a97a180f7c5226068e90451c77d56 /sys/arch | |
| parent | 7a9621f657ec871ffbe83307a4e7a8403aad7731 (diff) | |
Move some AES-related defines into xform.h to reduce duplication.
gmac.c is left untouched for now to preserve layering.
OK mikeb@, deraadt@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/aesni.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c index e2e4ffd7b1b..ce2808cbfc6 100644 --- a/sys/arch/amd64/amd64/aesni.c +++ b/sys/arch/amd64/amd64/aesni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aesni.c,v 1.43 2018/02/23 15:41:08 visa Exp $ */ +/* $OpenBSD: aesni.c,v 1.44 2018/04/09 04:34:56 visa Exp $ */ /*- * Copyright (c) 2003 Jason Wright * Copyright (c) 2003, 2004 Theo de Raadt @@ -34,15 +34,6 @@ #include <machine/fpu.h> -/* defines from crypto/xform.c */ -#define AESCTR_NONCESIZE 4 -#define AESCTR_IVSIZE 8 -#define AESCTR_BLOCKSIZE 16 - -#define AES_XTS_BLOCKSIZE 16 -#define AES_XTS_IVSIZE 8 -#define AES_XTS_ALPHA 0x87 /* GF(2^128) generator polynomial */ - struct aesni_aes_ctx { uint32_t aes_ekey[4 * (AES_MAXROUNDS + 1)]; uint32_t aes_dkey[4 * (AES_MAXROUNDS + 1)]; |