[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>

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 3dbb1cc6eab52f5eeba3767f52a6e8225c8d4173..47438b650c92d2e889251d8a7f244785c7108582 100644 (file)
--- 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 d8f8ec320213a4fc4656ad9340b30ddc904328a0..5991c53eabac8c842c6fe69e9c85270480974c4f 100644 (file)
--- 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 fc6b46f2a9b0d495724f32113e18652498cf1035..9a1a7316eeacf6f71befe1b149283a4350db0c56 100644 (file)
--- 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 4fd470bd729bef90bd9f606dbf43b9367f374165..7dcff671c19b6d91a6127467b57c4db91a23fff4 100644 (file)
--- 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;