Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CRYPTO] api: Add missing headers for setkey_unaligned

Browse source 
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>
This commit is contained in:
Herbert Xu 2007-08-23 16:23:01 +08:00 committed by David S. Miller
parent 39e1ee011f
commit 791b4d5f73
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crypto/ablkcipher.c
View file

@ -16,10 +16,13 @@
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h>
#include <linux/seq_file.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); struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
unsigned long alignmask = crypto_ablkcipher_alignmask(tfm); unsigned long alignmask = crypto_ablkcipher_alignmask(tfm);

6
crypto/blkcipher.c
View file

@ -339,7 +339,8 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
return blkcipher_walk_next(desc, walk); 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; struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); 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; return ret;
} }
static int setkey(struct crypto_tfm *tfm, const u8 *key, static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
unsigned int keylen)
{ {
struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher; struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);

5
crypto/cipher.c
View file

@ -16,11 +16,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/scatterlist.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include "internal.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; struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);

3
crypto/hash.c
View file

@ -12,6 +12,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "internal.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, 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 crypto_tfm *tfm = crypto_hash_tfm(crt);
struct hash_alg *alg = &tfm->__crt_alg->cra_hash; struct hash_alg *alg = &tfm->__crt_alg->cra_hash;