diff options
| author | Iuliana Prodan <iuliana.prodan@nxp.com> | 2019-02-08 15:50:08 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-02-15 13:21:55 +0800 |
| commit | bd30cf533b77420b7c504c09cef5ba26b0c9dcb4 (patch) | |
| tree | ac98fc4fef223060b37e255578258c941544afaf | |
| parent | ba4cf71b6f1b0165f34888b17fe44f4235dd0132 (diff) | |
| download | linux-bd30cf533b77420b7c504c09cef5ba26b0c9dcb4.tar.bz2 | |
crypto: export arc4 defines
Some arc4 cipher algorithm defines show up in two places:
crypto/arc4.c and drivers/crypto/bcm/cipher.h.
Let's export them in a common header and update their users.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/arc4.c | 5 | ||||
| -rw-r--r-- | drivers/crypto/bcm/cipher.h | 4 | ||||
| -rw-r--r-- | include/crypto/arc4.h | 13 |
3 files changed, 15 insertions, 7 deletions
diff --git a/crypto/arc4.c b/crypto/arc4.c index 652d24399afa..6c93342e3405 100644 --- a/crypto/arc4.c +++ b/crypto/arc4.c @@ -13,14 +13,11 @@ */ #include <crypto/algapi.h> +#include <crypto/arc4.h> #include <crypto/internal/skcipher.h> #include <linux/init.h> #include <linux/module.h> -#define ARC4_MIN_KEY_SIZE 1 -#define ARC4_MAX_KEY_SIZE 256 -#define ARC4_BLOCK_SIZE 1 - struct arc4_ctx { u32 S[256]; u32 x, y; diff --git a/drivers/crypto/bcm/cipher.h b/drivers/crypto/bcm/cipher.h index 763c425c41ca..f6da49758954 100644 --- a/drivers/crypto/bcm/cipher.h +++ b/drivers/crypto/bcm/cipher.h @@ -23,6 +23,7 @@ #include <crypto/aes.h> #include <crypto/internal/hash.h> #include <crypto/aead.h> +#include <crypto/arc4.h> #include <crypto/gcm.h> #include <crypto/sha.h> #include <crypto/sha3.h> @@ -34,9 +35,6 @@ /* Driver supports up to MAX_SPUS SPU blocks */ #define MAX_SPUS 16 -#define ARC4_MIN_KEY_SIZE 1 -#define ARC4_MAX_KEY_SIZE 256 -#define ARC4_BLOCK_SIZE 1 #define ARC4_STATE_SIZE 4 #define CCM_AES_IV_SIZE 16 diff --git a/include/crypto/arc4.h b/include/crypto/arc4.h new file mode 100644 index 000000000000..5b2c24ab0139 --- /dev/null +++ b/include/crypto/arc4.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Common values for ARC4 Cipher Algorithm + */ + +#ifndef _CRYPTO_ARC4_H +#define _CRYPTO_ARC4_H + +#define ARC4_MIN_KEY_SIZE 1 +#define ARC4_MAX_KEY_SIZE 256 +#define ARC4_BLOCK_SIZE 1 + +#endif /* _CRYPTO_ARC4_H */ |