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

Commit 716f9563 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

crypto: atmel - Fix authenc support when it is set to m 



[ Upstream commit 1520c72596dde7f22b8bd6bed3ef7df2b8b7ef39 ]

As it is if CONFIG_CRYPTO_DEV_ATMEL_AUTHENC is set to m it is in
effect disabled.  This patch fixes it by using IS_ENABLED instead
of ifdef.

Fixes: 89a82ef8 ("crypto: atmel-authenc - add support to...")
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b3fcff6b

drivers/crypto/atmel-aes.c

+9 −9
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct atmel_aes_xts_ctx { 
	u32			key2[AES_KEYSIZE_256 / sizeof(u32)];

};



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

struct atmel_aes_authenc_ctx {

	struct atmel_aes_base_ctx	base;

	struct atmel_sha_authenc_ctx	*auth;
@@ -160,7 +160,7 @@ struct atmel_aes_reqctx { 
	u32			lastc[AES_BLOCK_SIZE / sizeof(u32)];

};



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

struct atmel_aes_authenc_reqctx {

	struct atmel_aes_reqctx	base;
@@ -489,7 +489,7 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd) 
	return (dd->flags & AES_FLAGS_ENCRYPT);

}



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err);

#endif
@@ -518,7 +518,7 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd) 


static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)

{

#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

	if (dd->ctx->is_aead)

		atmel_aes_authenc_complete(dd, err);

#endif
@@ -1983,7 +1983,7 @@ static struct crypto_alg aes_xts_alg = { 
	}

};



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

/* authenc aead functions */



static int atmel_aes_authenc_start(struct atmel_aes_dev *dd);
@@ -2470,7 +2470,7 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd) 
{

	int i;



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

	if (dd->caps.has_authenc)

		for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++)

			crypto_unregister_aead(&aes_authenc_algs[i]);
@@ -2517,7 +2517,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) 
			goto err_aes_xts_alg;

	}



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

	if (dd->caps.has_authenc) {

		for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++) {

			err = crypto_register_aead(&aes_authenc_algs[i]);
@@ -2529,7 +2529,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) 


	return 0;



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

	/* i = ARRAY_SIZE(aes_authenc_algs); */

err_aes_authenc_alg:

	for (j = 0; j < i; j++)
@@ -2720,7 +2720,7 @@ static int atmel_aes_probe(struct platform_device *pdev) 


	atmel_aes_get_cap(aes_dd);



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

	if (aes_dd->caps.has_authenc && !atmel_sha_authenc_is_ready()) {

		err = -EPROBE_DEFER;

		goto iclk_unprepare;

drivers/crypto/atmel-authenc.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#ifndef __ATMEL_AUTHENC_H__

#define __ATMEL_AUTHENC_H__



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)



#include <crypto/authenc.h>

#include <crypto/hash.h>

drivers/crypto/atmel-sha.c

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ static struct ahash_alg sha_hmac_algs[] = { 
},

};



#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC

#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)

/* authenc functions */



static int atmel_sha_authenc_init2(struct atmel_sha_dev *dd);