diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-11-13 11:43:14 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-12-06 17:16:26 +0800 |
| commit | 044ab5257806310a0150146df3b74b8adaa4ebcf (patch) | |
| tree | 0396b6068d9547c28841c1808c48adf97e474e60 /include/crypto | |
| parent | f0fcf2002bf122afe8fe1b74b2cee3710c7e6cd9 (diff) | |
| download | linux-3.10-044ab5257806310a0150146df3b74b8adaa4ebcf.tar.gz linux-3.10-044ab5257806310a0150146df3b74b8adaa4ebcf.tar.bz2 linux-3.10-044ab5257806310a0150146df3b74b8adaa4ebcf.zip | |
crypto: cast5/cast6 - move lookup tables to shared module
CAST5 and CAST6 both use same lookup tables, which can be moved shared module
'cast_common'.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/cast5.h | 6 | ||||
| -rw-r--r-- | include/crypto/cast6.h | 6 | ||||
| -rw-r--r-- | include/crypto/cast_common.h | 9 |
3 files changed, 11 insertions, 10 deletions
diff --git a/include/crypto/cast5.h b/include/crypto/cast5.h index 586183a0406..14fbf39d638 100644 --- a/include/crypto/cast5.h +++ b/include/crypto/cast5.h @@ -3,6 +3,7 @@ #include <linux/types.h> #include <linux/crypto.h> +#include <crypto/cast_common.h> #define CAST5_BLOCK_SIZE 8 #define CAST5_MIN_KEY_SIZE 5 @@ -19,9 +20,4 @@ int cast5_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); void __cast5_encrypt(struct cast5_ctx *ctx, u8 *dst, const u8 *src); void __cast5_decrypt(struct cast5_ctx *ctx, u8 *dst, const u8 *src); -extern const u32 cast5_s1[256]; -extern const u32 cast5_s2[256]; -extern const u32 cast5_s3[256]; -extern const u32 cast5_s4[256]; - #endif diff --git a/include/crypto/cast6.h b/include/crypto/cast6.h index 157af6f342c..32b60eb8bd2 100644 --- a/include/crypto/cast6.h +++ b/include/crypto/cast6.h @@ -3,6 +3,7 @@ #include <linux/types.h> #include <linux/crypto.h> +#include <crypto/cast_common.h> #define CAST6_BLOCK_SIZE 16 #define CAST6_MIN_KEY_SIZE 16 @@ -20,9 +21,4 @@ int cast6_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); void __cast6_encrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src); void __cast6_decrypt(struct cast6_ctx *ctx, u8 *dst, const u8 *src); -extern const u32 cast6_s1[256]; -extern const u32 cast6_s2[256]; -extern const u32 cast6_s3[256]; -extern const u32 cast6_s4[256]; - #endif diff --git a/include/crypto/cast_common.h b/include/crypto/cast_common.h new file mode 100644 index 00000000000..b7df35cd9f0 --- /dev/null +++ b/include/crypto/cast_common.h @@ -0,0 +1,9 @@ +#ifndef _CRYPTO_CAST_COMMON_H +#define _CRYPTO_CAST_COMMON_H + +extern const u32 cast_s1[256]; +extern const u32 cast_s2[256]; +extern const u32 cast_s3[256]; +extern const u32 cast_s4[256]; + +#endif |