Commit 931c940f authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: s390/aes - fix name clash after AES library refactor 



The newly introduced AES library exposes aes_encrypt/aes_decrypt
routines so rename existing occurrences of those identifiers in
the s390 driver.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8dfa20fc

arch/s390/crypto/aes_s390.c

+4 −4
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	return 0;

}



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

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

{

	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
@@ -119,7 +119,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) 
	cpacf_km(sctx->fc, &sctx->key, out, in, AES_BLOCK_SIZE);

}



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

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

{

	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
@@ -172,8 +172,8 @@ static struct crypto_alg aes_alg = { 
			.cia_min_keysize	=	AES_MIN_KEY_SIZE,

			.cia_max_keysize	=	AES_MAX_KEY_SIZE,

			.cia_setkey		=	aes_set_key,

			.cia_encrypt		=	aes_encrypt,

			.cia_decrypt		=	aes_decrypt,

			.cia_encrypt		=	crypto_aes_encrypt,

			.cia_decrypt		=	crypto_aes_decrypt,

		}

	}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE