2016-01-27 22:09:16

by Tadeusz Struk

[permalink] [raw]
Subject: [PATCH] crypto: aead - move aead_request_cast helper to aead.h

Move the helper function to common header for everybody to use.

Signed-off-by: Tadeusz Struk <[email protected]>
---
drivers/crypto/atmel-aes.c | 6 ------
include/crypto/aead.h | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index 6dd3317..949af89 100644
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -369,12 +369,6 @@ static inline size_t atmel_aes_padlen(size_t len, size_t block_size)
return len ? block_size - len : 0;
}

-static inline struct aead_request *
-aead_request_cast(struct crypto_async_request *req)
-{
- return container_of(req, struct aead_request, base);
-}
-
static struct atmel_aes_dev *atmel_aes_find_dev(struct atmel_aes_base_ctx *ctx)
{
struct atmel_aes_dev *aes_dd = NULL;
diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 84d13b1..2de15fc 100644
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -304,6 +304,12 @@ static inline struct crypto_aead *crypto_aead_reqtfm(struct aead_request *req)
return __crypto_aead_cast(req->base.tfm);
}

+static inline struct aead_request *aead_request_cast(
+ struct crypto_async_request *req)
+{
+ return container_of(req, struct aead_request, base);
+}
+
/**
* crypto_aead_encrypt() - encrypt plaintext
* @req: reference to the aead_request handle that holds all information


2016-02-01 09:46:43

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] crypto: aead - move aead_request_cast helper to aead.h

On Wed, Jan 27, 2016 at 02:09:16PM -0800, Tadeusz Struk wrote:
> Move the helper function to common header for everybody to use.
>
> Signed-off-by: Tadeusz Struk <[email protected]>

This should go into internal/aead.h if at all. Longer term we
should look for ways to do away with direct uses of crypto_async_request.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2016-02-01 15:46:59

by Tadeusz Struk

[permalink] [raw]
Subject: Re: [PATCH] crypto: aead - move aead_request_cast helper to aead.h

On 02/01/2016 01:46 AM, Herbert Xu wrote:
>> Move the helper function to common header for everybody to use.
>> >
>> > Signed-off-by: Tadeusz Struk <[email protected]>
> This should go into internal/aead.h if at all.

Yes, I though about it, but I followed skcipher. The skcipher_request_cast()
helper is in crypto/skcipher.h not in crypto/internal/skcipher.h
Shouldn't this be consistent?
Thanks,

--
TS

2016-02-01 16:20:39

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] crypto: aead - move aead_request_cast helper to aead.h

On Mon, Feb 01, 2016 at 07:46:59AM -0800, Tadeusz Struk wrote:
>
> Yes, I though about it, but I followed skcipher. The skcipher_request_cast()
> helper is in crypto/skcipher.h not in crypto/internal/skcipher.h
> Shouldn't this be consistent?

Yes it should be moved into internal as well.

Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt