diff options
author | Sebastian Siewior <sebastian@breakpoint.cc> | 2007-10-17 11:18:57 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-10 16:16:04 -0500 |
commit | 89e12654312dddbbdbf17b5adc95b22cb672f947 (patch) | |
tree | b6c90424ece4dae2178c3b3843e37ebf41c8286b /arch/x86/crypto | |
parent | f1901f1fc710ec0fc482a7c98ee4552874139f39 (diff) |
[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/x86/crypto')
-rw-r--r-- | arch/x86/crypto/aes_32.c | 4 | ||||
-rw-r--r-- | arch/x86/crypto/aes_64.c | 6 |
2 files changed, 2 insertions, 8 deletions
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 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include <asm/byteorder.h> | 40 | #include <asm/byteorder.h> |
41 | #include <crypto/aes.h> | ||
41 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
42 | #include <linux/module.h> | 43 | #include <linux/module.h> |
43 | #include <linux/init.h> | 44 | #include <linux/init.h> |
@@ -48,9 +49,6 @@ | |||
48 | asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); | 49 | asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); |
49 | asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); | 50 | asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *dst, const u8 *src); |
50 | 51 | ||
51 | #define AES_MIN_KEY_SIZE 16 | ||
52 | #define AES_MAX_KEY_SIZE 32 | ||
53 | #define AES_BLOCK_SIZE 16 | ||
54 | #define AES_KS_LENGTH 4 * AES_BLOCK_SIZE | 52 | #define AES_KS_LENGTH 4 * AES_BLOCK_SIZE |
55 | #define RC_LENGTH 29 | 53 | #define RC_LENGTH 29 |
56 | 54 | ||
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 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <asm/byteorder.h> | 56 | #include <asm/byteorder.h> |
57 | #include <crypto/aes.h> | ||
57 | #include <linux/bitops.h> | 58 | #include <linux/bitops.h> |
58 | #include <linux/crypto.h> | 59 | #include <linux/crypto.h> |
59 | #include <linux/errno.h> | 60 | #include <linux/errno.h> |
@@ -61,11 +62,6 @@ | |||
61 | #include <linux/module.h> | 62 | #include <linux/module.h> |
62 | #include <linux/types.h> | 63 | #include <linux/types.h> |
63 | 64 | ||
64 | #define AES_MIN_KEY_SIZE 16 | ||
65 | #define AES_MAX_KEY_SIZE 32 | ||
66 | |||
67 | #define AES_BLOCK_SIZE 16 | ||
68 | |||
69 | /* | 65 | /* |
70 | * #define byte(x, nr) ((unsigned char)((x) >> (nr*8))) | 66 | * #define byte(x, nr) ((unsigned char)((x) >> (nr*8))) |
71 | */ | 67 | */ |