Commit 1520c725 authored by Herbert Xu's avatar Herbert Xu

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

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>
parent 298b4c60
...@@ -145,7 +145,7 @@ struct atmel_aes_xts_ctx { ...@@ -145,7 +145,7 @@ struct atmel_aes_xts_ctx {
u32 key2[AES_KEYSIZE_256 / sizeof(u32)]; 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_authenc_ctx {
struct atmel_aes_base_ctx base; struct atmel_aes_base_ctx base;
struct atmel_sha_authenc_ctx *auth; struct atmel_sha_authenc_ctx *auth;
...@@ -157,7 +157,7 @@ struct atmel_aes_reqctx { ...@@ -157,7 +157,7 @@ struct atmel_aes_reqctx {
u32 lastc[AES_BLOCK_SIZE / sizeof(u32)]; 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_authenc_reqctx {
struct atmel_aes_reqctx base; struct atmel_aes_reqctx base;
...@@ -486,7 +486,7 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd) ...@@ -486,7 +486,7 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd)
return (dd->flags & AES_FLAGS_ENCRYPT); 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); static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err);
#endif #endif
...@@ -515,7 +515,7 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd) ...@@ -515,7 +515,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) 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) if (dd->ctx->is_aead)
atmel_aes_authenc_complete(dd, err); atmel_aes_authenc_complete(dd, err);
#endif #endif
...@@ -1980,7 +1980,7 @@ static struct crypto_alg aes_xts_alg = { ...@@ -1980,7 +1980,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 */ /* authenc aead functions */
static int atmel_aes_authenc_start(struct atmel_aes_dev *dd); static int atmel_aes_authenc_start(struct atmel_aes_dev *dd);
...@@ -2467,7 +2467,7 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd) ...@@ -2467,7 +2467,7 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)
{ {
int i; int i;
#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC #if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)
if (dd->caps.has_authenc) if (dd->caps.has_authenc)
for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++) for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++)
crypto_unregister_aead(&aes_authenc_algs[i]); crypto_unregister_aead(&aes_authenc_algs[i]);
...@@ -2514,7 +2514,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) ...@@ -2514,7 +2514,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
goto err_aes_xts_alg; goto err_aes_xts_alg;
} }
#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC #if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)
if (dd->caps.has_authenc) { if (dd->caps.has_authenc) {
for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++) { for (i = 0; i < ARRAY_SIZE(aes_authenc_algs); i++) {
err = crypto_register_aead(&aes_authenc_algs[i]); err = crypto_register_aead(&aes_authenc_algs[i]);
...@@ -2526,7 +2526,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) ...@@ -2526,7 +2526,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
return 0; return 0;
#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC #if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)
/* i = ARRAY_SIZE(aes_authenc_algs); */ /* i = ARRAY_SIZE(aes_authenc_algs); */
err_aes_authenc_alg: err_aes_authenc_alg:
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
...@@ -2716,7 +2716,7 @@ static int atmel_aes_probe(struct platform_device *pdev) ...@@ -2716,7 +2716,7 @@ static int atmel_aes_probe(struct platform_device *pdev)
atmel_aes_get_cap(aes_dd); 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()) { if (aes_dd->caps.has_authenc && !atmel_sha_authenc_is_ready()) {
err = -EPROBE_DEFER; err = -EPROBE_DEFER;
goto iclk_unprepare; goto iclk_unprepare;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __ATMEL_AUTHENC_H__ #ifndef __ATMEL_AUTHENC_H__
#define __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/authenc.h>
#include <crypto/hash.h> #include <crypto/hash.h>
......
...@@ -2212,7 +2212,7 @@ static struct ahash_alg sha_hmac_algs[] = { ...@@ -2212,7 +2212,7 @@ static struct ahash_alg sha_hmac_algs[] = {
}, },
}; };
#ifdef CONFIG_CRYPTO_DEV_ATMEL_AUTHENC #if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)
/* authenc functions */ /* authenc functions */
static int atmel_sha_authenc_init2(struct atmel_sha_dev *dd); static int atmel_sha_authenc_init2(struct atmel_sha_dev *dd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment