diff mbox series

[2/6] crypto: aegis - drop empty TFM init/exit routines

Message ID 20190624073818.29296-3-ard.biesheuvel@linaro.org
State New
Headers show
Series crypto: aegis128 - add NEON intrinsics version for ARM/arm64 | expand

Commit Message

Ard Biesheuvel June 24, 2019, 7:38 a.m. UTC
TFM init/exit routines are optional, so no need to provide empty ones.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 crypto/aegis128.c  | 11 -----------
 crypto/aegis128l.c | 11 -----------
 crypto/aegis256.c  | 11 -----------
 3 files changed, 33 deletions(-)

-- 
2.20.1

Comments

Ondrej Mosnacek June 24, 2019, 8:03 a.m. UTC | #1
On Mon, Jun 24, 2019 at 9:38 AM Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
> TFM init/exit routines are optional, so no need to provide empty ones.

>

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>


> ---

>  crypto/aegis128.c  | 11 -----------

>  crypto/aegis128l.c | 11 -----------

>  crypto/aegis256.c  | 11 -----------

>  3 files changed, 33 deletions(-)

>

> diff --git a/crypto/aegis128.c b/crypto/aegis128.c

> index 125e11246990..4f8f1cdef129 100644

> --- a/crypto/aegis128.c

> +++ b/crypto/aegis128.c

> @@ -403,22 +403,11 @@ static int crypto_aegis128_decrypt(struct aead_request *req)

>         return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;

>  }

>

> -static int crypto_aegis128_init_tfm(struct crypto_aead *tfm)

> -{

> -       return 0;

> -}

> -

> -static void crypto_aegis128_exit_tfm(struct crypto_aead *tfm)

> -{

> -}

> -

>  static struct aead_alg crypto_aegis128_alg = {

>         .setkey = crypto_aegis128_setkey,

>         .setauthsize = crypto_aegis128_setauthsize,

>         .encrypt = crypto_aegis128_encrypt,

>         .decrypt = crypto_aegis128_decrypt,

> -       .init = crypto_aegis128_init_tfm,

> -       .exit = crypto_aegis128_exit_tfm,

>

>         .ivsize = AEGIS128_NONCE_SIZE,

>         .maxauthsize = AEGIS128_MAX_AUTH_SIZE,

> diff --git a/crypto/aegis128l.c b/crypto/aegis128l.c

> index 9bca3d619a22..ef5bc2297a2c 100644

> --- a/crypto/aegis128l.c

> +++ b/crypto/aegis128l.c

> @@ -467,22 +467,11 @@ static int crypto_aegis128l_decrypt(struct aead_request *req)

>         return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;

>  }

>

> -static int crypto_aegis128l_init_tfm(struct crypto_aead *tfm)

> -{

> -       return 0;

> -}

> -

> -static void crypto_aegis128l_exit_tfm(struct crypto_aead *tfm)

> -{

> -}

> -

>  static struct aead_alg crypto_aegis128l_alg = {

>         .setkey = crypto_aegis128l_setkey,

>         .setauthsize = crypto_aegis128l_setauthsize,

>         .encrypt = crypto_aegis128l_encrypt,

>         .decrypt = crypto_aegis128l_decrypt,

> -       .init = crypto_aegis128l_init_tfm,

> -       .exit = crypto_aegis128l_exit_tfm,

>

>         .ivsize = AEGIS128L_NONCE_SIZE,

>         .maxauthsize = AEGIS128L_MAX_AUTH_SIZE,

> diff --git a/crypto/aegis256.c b/crypto/aegis256.c

> index b47fd39595ad..b824ef4d1248 100644

> --- a/crypto/aegis256.c

> +++ b/crypto/aegis256.c

> @@ -418,22 +418,11 @@ static int crypto_aegis256_decrypt(struct aead_request *req)

>         return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;

>  }

>

> -static int crypto_aegis256_init_tfm(struct crypto_aead *tfm)

> -{

> -       return 0;

> -}

> -

> -static void crypto_aegis256_exit_tfm(struct crypto_aead *tfm)

> -{

> -}

> -

>  static struct aead_alg crypto_aegis256_alg = {

>         .setkey = crypto_aegis256_setkey,

>         .setauthsize = crypto_aegis256_setauthsize,

>         .encrypt = crypto_aegis256_encrypt,

>         .decrypt = crypto_aegis256_decrypt,

> -       .init = crypto_aegis256_init_tfm,

> -       .exit = crypto_aegis256_exit_tfm,

>

>         .ivsize = AEGIS256_NONCE_SIZE,

>         .maxauthsize = AEGIS256_MAX_AUTH_SIZE,

> --

> 2.20.1

>



-- 
Ondrej Mosnacek <omosnace at redhat dot com>
Software Engineer, Security Technologies
Red Hat, Inc.
diff mbox series

Patch

diff --git a/crypto/aegis128.c b/crypto/aegis128.c
index 125e11246990..4f8f1cdef129 100644
--- a/crypto/aegis128.c
+++ b/crypto/aegis128.c
@@ -403,22 +403,11 @@  static int crypto_aegis128_decrypt(struct aead_request *req)
 	return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;
 }
 
-static int crypto_aegis128_init_tfm(struct crypto_aead *tfm)
-{
-	return 0;
-}
-
-static void crypto_aegis128_exit_tfm(struct crypto_aead *tfm)
-{
-}
-
 static struct aead_alg crypto_aegis128_alg = {
 	.setkey = crypto_aegis128_setkey,
 	.setauthsize = crypto_aegis128_setauthsize,
 	.encrypt = crypto_aegis128_encrypt,
 	.decrypt = crypto_aegis128_decrypt,
-	.init = crypto_aegis128_init_tfm,
-	.exit = crypto_aegis128_exit_tfm,
 
 	.ivsize = AEGIS128_NONCE_SIZE,
 	.maxauthsize = AEGIS128_MAX_AUTH_SIZE,
diff --git a/crypto/aegis128l.c b/crypto/aegis128l.c
index 9bca3d619a22..ef5bc2297a2c 100644
--- a/crypto/aegis128l.c
+++ b/crypto/aegis128l.c
@@ -467,22 +467,11 @@  static int crypto_aegis128l_decrypt(struct aead_request *req)
 	return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;
 }
 
-static int crypto_aegis128l_init_tfm(struct crypto_aead *tfm)
-{
-	return 0;
-}
-
-static void crypto_aegis128l_exit_tfm(struct crypto_aead *tfm)
-{
-}
-
 static struct aead_alg crypto_aegis128l_alg = {
 	.setkey = crypto_aegis128l_setkey,
 	.setauthsize = crypto_aegis128l_setauthsize,
 	.encrypt = crypto_aegis128l_encrypt,
 	.decrypt = crypto_aegis128l_decrypt,
-	.init = crypto_aegis128l_init_tfm,
-	.exit = crypto_aegis128l_exit_tfm,
 
 	.ivsize = AEGIS128L_NONCE_SIZE,
 	.maxauthsize = AEGIS128L_MAX_AUTH_SIZE,
diff --git a/crypto/aegis256.c b/crypto/aegis256.c
index b47fd39595ad..b824ef4d1248 100644
--- a/crypto/aegis256.c
+++ b/crypto/aegis256.c
@@ -418,22 +418,11 @@  static int crypto_aegis256_decrypt(struct aead_request *req)
 	return crypto_memneq(tag.bytes, zeros, authsize) ? -EBADMSG : 0;
 }
 
-static int crypto_aegis256_init_tfm(struct crypto_aead *tfm)
-{
-	return 0;
-}
-
-static void crypto_aegis256_exit_tfm(struct crypto_aead *tfm)
-{
-}
-
 static struct aead_alg crypto_aegis256_alg = {
 	.setkey = crypto_aegis256_setkey,
 	.setauthsize = crypto_aegis256_setauthsize,
 	.encrypt = crypto_aegis256_encrypt,
 	.decrypt = crypto_aegis256_decrypt,
-	.init = crypto_aegis256_init_tfm,
-	.exit = crypto_aegis256_exit_tfm,
 
 	.ivsize = AEGIS256_NONCE_SIZE,
 	.maxauthsize = AEGIS256_MAX_AUTH_SIZE,