diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-08-23 16:23:01 +0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:55:40 -0700 |
| commit | 791b4d5f73cbc16ee532ebac5bd82d51524d4f99 (patch) | |
| tree | df9e5ee5a6e94892fb1056627caea4e494343083 | |
| parent | 39e1ee011f42dbbcb0210c73ea728ae54cf63b06 (diff) | |
| download | linux-stable-791b4d5f73cbc16ee532ebac5bd82d51524d4f99.tar.gz linux-stable-791b4d5f73cbc16ee532ebac5bd82d51524d4f99.tar.bz2 linux-stable-791b4d5f73cbc16ee532ebac5bd82d51524d4f99.zip | |
[CRYPTO] api: Add missing headers for setkey_unaligned
This patch ensures that kernel.h and slab.h are included for
the setkey_unaligned function. It also breaks a couple of
long lines.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/ablkcipher.c | 5 | ||||
| -rw-r--r-- | crypto/blkcipher.c | 6 | ||||
| -rw-r--r-- | crypto/cipher.c | 5 | ||||
| -rw-r--r-- | crypto/hash.c | 3 |
4 files changed, 12 insertions, 7 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index 3dbb1cc6eab5..47438b650c92 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -16,10 +16,13 @@ #include <crypto/algapi.h> #include <linux/errno.h> #include <linux/init.h> +#include <linux/kernel.h> #include <linux/module.h> +#include <linux/slab.h> #include <linux/seq_file.h> -static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsigned int keylen) +static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, + unsigned int keylen) { struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm); unsigned long alignmask = crypto_ablkcipher_alignmask(tfm); diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index d8f8ec320213..5991c53eabac 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -339,7 +339,8 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc, return blkcipher_walk_next(desc, walk); } -static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) +static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, + unsigned int keylen) { struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher; unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); @@ -360,8 +361,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int return ret; } -static int setkey(struct crypto_tfm *tfm, const u8 *key, - unsigned int keylen) +static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) { struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher; unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); diff --git a/crypto/cipher.c b/crypto/cipher.c index fc6b46f2a9b0..9a1a7316eeac 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -16,11 +16,12 @@ #include <linux/kernel.h> #include <linux/crypto.h> #include <linux/errno.h> -#include <linux/scatterlist.h> +#include <linux/slab.h> #include <linux/string.h> #include "internal.h" -static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) +static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, + unsigned int keylen) { struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher; unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); diff --git a/crypto/hash.c b/crypto/hash.c index 4fd470bd729b..7dcff671c19b 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -12,6 +12,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/slab.h> #include <linux/seq_file.h> #include "internal.h" @@ -46,7 +47,7 @@ static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key, } static int hash_setkey(struct crypto_hash *crt, const u8 *key, - unsigned int keylen) + unsigned int keylen) { struct crypto_tfm *tfm = crypto_hash_tfm(crt); struct hash_alg *alg = &tfm->__crt_alg->cra_hash; |