diff options
| author | Sebastian Siewior <sebastian@breakpoint.cc> | 2007-10-17 17:18:57 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-10 22:16:04 +0100 |
| commit | 89e12654312dddbbdbf17b5adc95b22cb672f947 (patch) | |
| tree | b6c90424ece4dae2178c3b3843e37ebf41c8286b /arch | |
| parent | [CRYPTO] geode: remove alias (diff) | |
| download | linux-89e12654312dddbbdbf17b5adc95b22cb672f947.tar.xz linux-89e12654312dddbbdbf17b5adc95b22cb672f947.zip | |
[CRYPTO] aes: Move common defines into a header file
This three defines are used in all AES related hardware.
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/crypto/aes_s390.c | 7 | ||||
| -rw-r--r-- | arch/x86/crypto/aes_32.c | 4 | ||||
| -rw-r--r-- | arch/x86/crypto/aes_64.c | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index 512669691ad0..812511bbb540 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -16,17 +16,12 @@ * */ +#include <crypto/aes.h> #include <crypto/algapi.h> #include <linux/module.h> #include <linux/init.h> #include "crypt_s390.h" -#define AES_MIN_KEY_SIZE 16 -#define AES_MAX_KEY_SIZE 32 - -/* data block size for all key lengths */ -#define AES_BLOCK_SIZE 16 - #define AES_KEYLEN_128 1 #define AES_KEYLEN_192 2 #define AES_KEYLEN_256 4 diff --git a/arch/x86/crypto/aes_32.c b/arch/x86/crypto/aes_32.c index 49aad9397f10..9b0ab50394b0 100644 --- a/arch/x86/crypto/aes_32.c +++ b/arch/x86/crypto/aes_32.c @@ -38,6 +38,7 @@ */ #include <asm/byteorder.h> +#include <crypto/aes.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> @@ -48,9 +49,6 @@ asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); -#define AES_MIN_KEY_SIZE 16 -#define AES_MAX_KEY_SIZE 32 -#define AES_BLOCK_SIZE 16 #define AES_KS_LENGTH 4 * AES_BLOCK_SIZE #define RC_LENGTH 29 diff --git a/arch/x86/crypto/aes_64.c b/arch/x86/crypto/aes_64.c index 5cdb13ea5cc2..0b38a4cd2ce1 100644 --- a/arch/x86/crypto/aes_64.c +++ b/arch/x86/crypto/aes_64.c @@ -54,6 +54,7 @@ */ #include <asm/byteorder.h> +#include <crypto/aes.h> #include <linux/bitops.h> #include <linux/crypto.h> #include <linux/errno.h> @@ -61,11 +62,6 @@ #include <linux/module.h> #include <linux/types.h> -#define AES_MIN_KEY_SIZE 16 -#define AES_MAX_KEY_SIZE 32 - -#define AES_BLOCK_SIZE 16 - /* * #define byte(x, nr) ((unsigned char)((x) >> (nr*8))) */ |