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

Commit e6a67ad0 authored by Chen Gang's avatar Chen Gang Committed by Martin Schwidefsky
Browse files

s390/crypto: remove 'const' to avoid compiler warnings 



In aes_encrypt() and aes_decrypt(), need let 'sctx->key' be modified,
so remove 'const' for it. The related warnings:

    CC [M]  arch/s390/crypto/aes_s390.o
  arch/s390/crypto/aes_s390.c: In function 'aes_encrypt':
  arch/s390/crypto/aes_s390.c:146:37: warning: passing argument 2 of 'crypt_s390_km' discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
     crypt_s390_km(KM_AES_128_ENCRYPT, &sctx->key, out, in,
                                       ^
  ...

  In file included from arch/s390/crypto/aes_s390.c:29:0:
  arch/s390/crypto/crypt_s390.h:154:19: note: expected 'void *' but argument is of type 'const u8 (*)[32] {aka const unsigned char (*)[32]}'
   static inline int crypt_s390_km(long func, void *param,
                     ^

Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 91c0837e

arch/s390/crypto/aes_s390.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, 




static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

{

	const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);

	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);





	if (unlikely(need_fallback(sctx->key_len))) {

	if (unlikely(need_fallback(sctx->key_len))) {

		crypto_cipher_encrypt_one(sctx->fallback.cip, out, in);

		crypto_cipher_encrypt_one(sctx->fallback.cip, out, in);
@@ -159,7 +159,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 




static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

{

	const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);

	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);





	if (unlikely(need_fallback(sctx->key_len))) {

	if (unlikely(need_fallback(sctx->key_len))) {

		crypto_cipher_decrypt_one(sctx->fallback.cip, out, in);

		crypto_cipher_decrypt_one(sctx->fallback.cip, out, in);