diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-11-15 11:44:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 09:09:51 +0100 |
| commit | b58c90c3a2c15f4143f042a79b34df3276952e32 (patch) | |
| tree | 51ce81349e8503910dc1f5ed49c98382f8e65cc3 | |
| parent | f8ed29310ff5a2279fd87aa91b722fda3e8ffd39 (diff) | |
| download | linux-stable-b58c90c3a2c15f4143f042a79b34df3276952e32.tar.gz linux-stable-b58c90c3a2c15f4143f042a79b34df3276952e32.tar.bz2 linux-stable-b58c90c3a2c15f4143f042a79b34df3276952e32.zip | |
crypto: keywrap - Add missing ULL suffixes for 64-bit constants
[ Upstream commit c9683276dd89906ca9b65696d09104d542171421 ]
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: 9e49451d7a15365d ("crypto: keywrap - simplify code")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/keywrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/keywrap.c b/crypto/keywrap.c index 744e35134c45..ec5c6a087c90 100644 --- a/crypto/keywrap.c +++ b/crypto/keywrap.c @@ -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 |