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

Commit c9683276 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Herbert Xu
Browse files

crypto: keywrap - Add missing ULL suffixes for 64-bit constants 



On 32-bit (e.g. with m68k-linux-gnu-gcc-4.1):

    crypto/keywrap.c: In function ‘crypto_kw_decrypt’:
    crypto/keywrap.c:191: warning: integer constant is too large for ‘long’ type
    crypto/keywrap.c: In function ‘crypto_kw_encrypt’:
    crypto/keywrap.c:224: warning: integer constant is too large for ‘long’ type

Fixes: 9e49451d ("crypto: keywrap - simplify code")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 5601e014

crypto/keywrap.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int crypto_kw_decrypt(struct blkcipher_desc *desc, 
	}



	/* Perform authentication check */

	if (block.A != cpu_to_be64(0xa6a6a6a6a6a6a6a6))

	if (block.A != cpu_to_be64(0xa6a6a6a6a6a6a6a6ULL))

		ret = -EBADMSG;



	memzero_explicit(&block, sizeof(struct crypto_kw_block));
@@ -221,7 +221,7 @@ static int crypto_kw_encrypt(struct blkcipher_desc *desc, 
	 * Place the predefined IV into block A -- for encrypt, the caller

	 * does not need to provide an IV, but he needs to fetch the final IV.

	 */

	block.A = cpu_to_be64(0xa6a6a6a6a6a6a6a6);

	block.A = cpu_to_be64(0xa6a6a6a6a6a6a6a6ULL);



	/*

	 * src scatterlist is read-only. dst scatterlist is r/w. During the