Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 791b4d5f authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 39e1ee01

crypto/ablkcipher.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

crypto/blkcipher.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

crypto/cipher.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

crypto/hash.c

+2 −1
Original line number Diff line number Diff line
@@ -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"