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

Commit 66b3e887 authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: caam - change key gen functions to return signed int 



commit 2af8f4a2 "crypto: caam - coccicheck fixes" added error
return values yet neglected to change the type from unsigned.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 87de4579

drivers/crypto/caam/caamhash.c

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) 
	return 0;

}



static u32 gen_split_hash_key(struct caam_hash_ctx *ctx, const u8 *key_in,

static int gen_split_hash_key(struct caam_hash_ctx *ctx, const u8 *key_in,

			      u32 keylen)

{

	return gen_split_key(ctx->jrdev, ctx->key, ctx->split_key_len,
@@ -420,7 +420,7 @@ static u32 gen_split_hash_key(struct caam_hash_ctx *ctx, const u8 *key_in, 
}



/* Digest hash size if it is too large */

static u32 hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,

static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,

			   u32 *keylen, u8 *key_out, u32 digestsize)

{

	struct device *jrdev = ctx->jrdev;

drivers/crypto/caam/key_gen.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ Split key generation----------------------------------------------- 
[06] 0x64260028    fifostr: class2 mdsplit-jdk len=40

			@0xffe04000

*/

u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

		  int split_key_pad_len, const u8 *key_in, u32 keylen,

		  u32 alg_op)

{

drivers/crypto/caam/key_gen.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ struct split_key_result { 


void split_key_done(struct device *dev, u32 *desc, u32 err, void *context);



u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

int gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len,

		    int split_key_pad_len, const u8 *key_in, u32 keylen,

		    u32 alg_op);