aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Siewior <sebastian@breakpoint.cc>2007-10-17 23:18:57 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-11 08:16:04 +1100
commit89e12654312dddbbdbf17b5adc95b22cb672f947 (patch)
treeb6c90424ece4dae2178c3b3843e37ebf41c8286b
parentf1901f1fc710ec0fc482a7c98ee4552874139f39 (diff)
download96b-common-89e12654312dddbbdbf17b5adc95b22cb672f947.tar.gz
[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>
-rw-r--r--arch/s390/crypto/aes_s390.c7
-rw-r--r--arch/x86/crypto/aes_32.c4
-rw-r--r--arch/x86/crypto/aes_64.c6
-rw-r--r--crypto/aes_generic.c6
-rw-r--r--drivers/crypto/geode-aes.c1
-rw-r--r--drivers/crypto/padlock-aes.c4
-rw-r--r--include/crypto/aes.h15
7 files changed, 21 insertions, 22 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)))
*/
diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c
index 9401dca85e87..6683260475f9 100644
--- a/crypto/aes_generic.c
+++ b/crypto/aes_generic.c
@@ -52,6 +52,7 @@
s/RIJNDAEL(d_key)/D_KEY/g
*/
+#include <crypto/aes.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@ -59,11 +60,6 @@
#include <linux/crypto.h>
#include <asm/byteorder.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)))
*/
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index fa4c9904346f..5008a1cddffb 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -13,6 +13,7 @@
#include <linux/crypto.h>
#include <linux/spinlock.h>
#include <crypto/algapi.h>
+#include <crypto/aes.h>
#include <asm/io.h>
#include <asm/delay.h>
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 5f7e71810489..c33334ac987e 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -44,6 +44,7 @@
*/
#include <crypto/algapi.h>
+#include <crypto/aes.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@ -53,9 +54,6 @@
#include <asm/byteorder.h>
#include "padlock.h"
-#define AES_MIN_KEY_SIZE 16 /* in uint8_t units */
-#define AES_MAX_KEY_SIZE 32 /* ditto */
-#define AES_BLOCK_SIZE 16 /* ditto */
#define AES_EXTENDED_KEY_SIZE 64 /* in uint32_t units */
#define AES_EXTENDED_KEY_SIZE_B (AES_EXTENDED_KEY_SIZE * sizeof(uint32_t))
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
new file mode 100644
index 000000000000..9ff842fc6b89
--- /dev/null
+++ b/include/crypto/aes.h
@@ -0,0 +1,15 @@
+/*
+ * Common values for AES algorithms
+ */
+
+#ifndef _CRYPTO_AES_H
+#define _CRYPTO_AES_H
+
+#define AES_MIN_KEY_SIZE 16
+#define AES_MAX_KEY_SIZE 32
+#define AES_KEYSIZE_128 16
+#define AES_KEYSIZE_192 24
+#define AES_KEYSIZE_256 32
+#define AES_BLOCK_SIZE 16
+
+#endif