crypto: vmx - Use skcipher for cbc fallback
PATCH 1/2 crypto: vmx - Use skcipher for cbc fallback
--- drivers/crypto/vmx/aes_cbc.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)
drivers/crypto/vmx/aes_cbc.c +20 -21
@@ -27,11 +27,12 @@#include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/internal/skcipher.h> #include "aesp8-ppc.h" struct p8_aes_cbc_ctx { -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct aes_key enc_key;struct aes_key dec_key; };
@@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx {static int p8_aes_cbc_init (struct crypto_tfm *tfm) {const char *alg; -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (!(alg =crypto_tfm_alg_name (tfm))) {
@@ -48,7 +49,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) } fallback = -crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); +crypto_alloc_skcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK );if (IS_ERR (fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",
@@ -58,9 +59,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)printk (KERN_INFO "Using '%s' as fallback implementation.\n" ,crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); -crypto_blkcipher_set_flags ( +crypto_skcipher_set_flags ( fallback, -crypto_blkcipher_get_flags ((struct crypto_blkcipher *)tfm)); +crypto_skcipher_get_flags ((struct crypto_skcipher *)tfm)); ctx->fallback = fallback;return 0 ;
@@ -71,7 +72,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (ctx->fallback) { -crypto_free_blkcipher (ctx->fallback); +crypto_free_skcipher (ctx->fallback); ctx->fallback =NULL ; } }
@@ -91,7 +92,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,pagefault_enable ();preempt_enable (); - ret +=crypto_blkcipher_setkey (ctx->fallback, key, keylen); + ret +=crypto_skcipher_setkey (ctx->fallback, key, keylen);return ret; }
@@ -103,15 +104,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
@@ -144,15 +144,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_decrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_decrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
Signature · 1 line
2.9.3
Hi Paulo.
Quoted 10 lines · Paulo Flabiano Smorigo
Signed-off-by Paulo Flabiano Smorigo <[email protected]>--- drivers/crypto/vmx/aes_cbc.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)drivers/crypto/vmx/aes_cbc.c +0
-0
drivers/crypto/vmx/aes_cbc.c line 30
Quoted 4 lines
drivers/crypto/vmx/aes_cbc.c +1
-0@@ -27,11 +27,12 @@#include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/internal/skcipher.h>
Isn't crypto/skcipher.h enough?
Quoted 66 lines
drivers/crypto/vmx/aes_cbc.c +7
-12#include "aesp8-ppc.h" struct p8_aes_cbc_ctx { -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct aes_key enc_key;struct aes_key dec_key; };@@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx {static int p8_aes_cbc_init (struct crypto_tfm *tfm) {const char *alg; -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (!(alg =crypto_tfm_alg_name (tfm))) {@@ -48,7 +49,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) } fallback = -crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); +crypto_alloc_skcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK );if (IS_ERR (fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",@@ -58,9 +59,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)printk (KERN_INFO "Using '%s' as fallback implementation.\n" ,crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); -crypto_blkcipher_set_flags ( +crypto_skcipher_set_flags ( fallback, -crypto_blkcipher_get_flags ((struct crypto_blkcipher *)tfm)); +crypto_skcipher_get_flags ((struct crypto_skcipher *)tfm)); ctx->fallback = fallback;return 0 ;@@ -71,7 +72,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (ctx->fallback) { -crypto_free_blkcipher (ctx->fallback); +crypto_free_skcipher (ctx->fallback); ctx->fallback =NULL ; } }@@ -91,7 +92,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,pagefault_enable ();preempt_enable (); - ret +=crypto_blkcipher_setkey (ctx->fallback, key, keylen); + ret +=crypto_skcipher_setkey (ctx->fallback, key, keylen);return ret; }@@ -103,15 +104,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };
drivers/crypto/vmx/aes_cbc.c static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, · line 114
Quoted 10 lines
drivers/crypto/vmx/aes_cbc.c +6
-2if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req);
Probably you have to wait for the completion here before proceeding.
Check Documentation/crypto/api-samples.rst
Quoted 12 lines
drivers/crypto/vmx/aes_cbc.c +0
-5}else {preempt_disable ();pagefault_disable ();@@ -144,15 +144,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };
drivers/crypto/vmx/aes_cbc.c static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, · line 154
Quoted 10 lines
drivers/crypto/vmx/aes_cbc.c +6
-2if (in_interrupt ()) { - ret =crypto_blkcipher_decrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_decrypt (req); +skcipher_request_zero (req);
Same here.
Quoted 6 lines
drivers/crypto/vmx/aes_cbc.c +0
-0}else {preempt_disable ();pagefault_disable ();Signature · 1 line
2.9.3
Signature · 2 lines
Regards, Marcelo
Hi Hebert,
Quoted 16 lines · Marcelo Cerri
Hi Paulo.
drivers/crypto/vmx/aes_cbc.c static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, · line 114
Quoted 10 lines · Paulo Flabiano Smorigo
drivers/crypto/vmx/aes_cbc.c +6
-2if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req);Probably you have to wait for the completion here before proceeding.
Quoted 2 lines
Check
Documentation/crypto/api-samples.rst
I noticed you used a similar approach in arch/s390/crypto/aes_s390.c (commit 64e2680).
How do you ensure the skcipher operation will not be asynchronous?
Signature · 2 lines
Regards, Marcelo
Herbert Xu
maintainerQuoted 5 lines · Marcelo Cerri
I noticed you used a similar approach in
arch/s390/crypto/aes_s390.c(commit 64e2680).How do you ensure the skcipher operation will not be asynchronous?
You need to set the bit CRYPTO_ALG_ASYNC in the mask field when allocating the algorithm to ensure that it's synchronous.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
It makes sense. Thanks for the clarification, Herbert.
One more question: are you planning to convert the ctr template to skcipher?
Signature · 2 lines
Regards, Marcelo
Quoted 15 lines · Herbert Xu
Quoted 5 lines · Marcelo Cerri
I noticed you used a similar approach in
arch/s390/crypto/aes_s390.c(commit 64e2680).How do you ensure the skcipher operation will not be asynchronous?
You need to set the bit
CRYPTO_ALG_ASYNCin the mask field when allocating the algorithm to ensure that it's synchronous.Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerQuoted 4 lines · Marcelo Cerri
It makes sense. Thanks for the clarification, Herbert.
One more question: are you planning to convert the ctr template to skcipher?
Yes everything will be converted.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerdrivers/crypto/vmx/aes_cbc.c static int p8_aes_cbc_init(struct crypto_tfm *tfm) · line 52
Quoted 4 lines · Paulo Flabiano Smorigo
fallback =
drivers/crypto/vmx/aes_cbc.c +1
-1-crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); +crypto_alloc_skcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK );
You need to add CRYPTO_ALG_ASYNC to the mask in order to ensure that you get a sync algorithm.
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
PATCH v2 1/2 crypto: vmx - Use skcipher for cbc fallback
--- drivers/crypto/vmx/aes_cbc.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/crypto/vmx/aes_cbc.c +22 -22
@@ -27,11 +27,12 @@#include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/skcipher.h> #include "aesp8-ppc.h" struct p8_aes_cbc_ctx { -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct aes_key enc_key;struct aes_key dec_key; };
@@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx {static int p8_aes_cbc_init (struct crypto_tfm *tfm) {const char *alg; -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (!(alg =crypto_tfm_alg_name (tfm))) {
@@ -47,8 +48,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)return -ENOENT ; } - fallback = -crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); + fallback =crypto_alloc_skcipher (alg,0 , +CRYPTO_ALG_ASYNC |CRYPTO_ALG_NEED_FALLBACK ); +if (IS_ERR (fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",
@@ -58,9 +60,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)printk (KERN_INFO "Using '%s' as fallback implementation.\n" ,crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); -crypto_blkcipher_set_flags ( +crypto_skcipher_set_flags ( fallback, -crypto_blkcipher_get_flags ((struct crypto_blkcipher *)tfm)); +crypto_skcipher_get_flags ((struct crypto_skcipher *)tfm)); ctx->fallback = fallback;return 0 ;
@@ -71,7 +73,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (ctx->fallback) { -crypto_free_blkcipher (ctx->fallback); +crypto_free_skcipher (ctx->fallback); ctx->fallback =NULL ; } }
@@ -91,7 +93,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,pagefault_enable ();preempt_enable (); - ret +=crypto_blkcipher_setkey (ctx->fallback, key, keylen); + ret +=crypto_skcipher_setkey (ctx->fallback, key, keylen);return ret; }
@@ -103,15 +105,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
@@ -144,15 +145,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_decrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_decrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
Signature · 1 line
2.7.4
Quoted 45 lines · Paulo Flabiano Smorigo
Signed-off-by Paulo Flabiano Smorigo <[email protected]>--- drivers/crypto/vmx/aes_cbc.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)drivers/crypto/vmx/aes_cbc.c +6
-4@@ -27,11 +27,12 @@#include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/skcipher.h> #include "aesp8-ppc.h" struct p8_aes_cbc_ctx { -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct aes_key enc_key;struct aes_key dec_key; };@@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx {static int p8_aes_cbc_init (struct crypto_tfm *tfm) {const char *alg; -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (!(alg =crypto_tfm_alg_name (tfm))) {@@ -47,8 +48,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)return -ENOENT ; } - fallback = -crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); + fallback =crypto_alloc_skcipher (alg,0 , +CRYPTO_ALG_ASYNC |CRYPTO_ALG_NEED_FALLBACK ); +if (IS_ERR (fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",
drivers/crypto/vmx/aes_cbc.c static int p8_aes_cbc_init(struct crypto_tfm *tfm) · line 61
Quoted 2 lines
drivers/crypto/vmx/aes_cbc.c +0
-0@@ -58,9 +60,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)printk (KERN_INFO "Using '%s' as fallback implementation.\n" ,crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback));
You need to update that to use crypto_skcipher_tfm(). The same is valid for the xts patch.
Quoted 74 lines
drivers/crypto/vmx/aes_cbc.c +16
-18-crypto_blkcipher_set_flags ( +crypto_skcipher_set_flags ( fallback, -crypto_blkcipher_get_flags ((struct crypto_blkcipher *)tfm)); +crypto_skcipher_get_flags ((struct crypto_skcipher *)tfm)); ctx->fallback = fallback;return 0 ;@@ -71,7 +73,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (ctx->fallback) { -crypto_free_blkcipher (ctx->fallback); +crypto_free_skcipher (ctx->fallback); ctx->fallback =NULL ; } }@@ -91,7 +93,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,pagefault_enable ();preempt_enable (); - ret +=crypto_blkcipher_setkey (ctx->fallback, key, keylen); + ret +=crypto_skcipher_setkey (ctx->fallback, key, keylen);return ret; }@@ -103,15 +105,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();@@ -144,15 +145,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_decrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_decrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();Signature · 1 line
2.7.4
Signature · 2 lines
Regards, Marcelo
PATCH v3 1/2 crypto: vmx - Use skcipher for cbc fallback
--- drivers/crypto/vmx/aes_cbc.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
drivers/crypto/vmx/aes_cbc.c +24 -23
@@ -27,11 +27,12 @@#include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/skcipher.h> #include "aesp8-ppc.h" struct p8_aes_cbc_ctx { -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct aes_key enc_key;struct aes_key dec_key; };
@@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx {static int p8_aes_cbc_init (struct crypto_tfm *tfm) {const char *alg; -struct crypto_blkcipher *fallback; +struct crypto_skcipher *fallback;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (!(alg =crypto_tfm_alg_name (tfm))) {
@@ -47,8 +48,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)return -ENOENT ; } - fallback = -crypto_alloc_blkcipher (alg,0 ,CRYPTO_ALG_NEED_FALLBACK ); + fallback =crypto_alloc_skcipher (alg,0 , +CRYPTO_ALG_ASYNC |CRYPTO_ALG_NEED_FALLBACK ); +if (IS_ERR (fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n",
@@ -56,11 +58,12 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm)return PTR_ERR (fallback); }printk (KERN_INFO "Using '%s' as fallback implementation.\n" , -crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); +crypto_skcipher_driver_name (fallback)); + -crypto_blkcipher_set_flags ( +crypto_skcipher_set_flags ( fallback, -crypto_blkcipher_get_flags ((struct crypto_blkcipher *)tfm)); +crypto_skcipher_get_flags ((struct crypto_skcipher *)tfm)); ctx->fallback = fallback;return 0 ;
@@ -71,7 +74,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm)struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (tfm);if (ctx->fallback) { -crypto_free_blkcipher (ctx->fallback); +crypto_free_skcipher (ctx->fallback); ctx->fallback =NULL ; } }
@@ -91,7 +94,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key,pagefault_enable ();preempt_enable (); - ret +=crypto_blkcipher_setkey (ctx->fallback, key, keylen); + ret +=crypto_skcipher_setkey (ctx->fallback, key, keylen);return ret; }
@@ -103,15 +106,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_encrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_encrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
@@ -144,15 +146,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc,struct blkcipher_walk walk;struct p8_aes_cbc_ctx *ctx =crypto_tfm_ctx (crypto_blkcipher_tfm (desc->tfm)); -struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - };if (in_interrupt ()) { - ret =crypto_blkcipher_decrypt (&fallback_desc, dst, src, - nbytes); +SKCIPHER_REQUEST_ON_STACK (req, ctx->fallback); +skcipher_request_set_tfm (req, ctx->fallback); +skcipher_request_set_callback (req, desc->flags,NULL ,NULL ); +skcipher_request_set_crypt (req, src, dst, nbytes, desc->info); + ret =crypto_skcipher_decrypt (req); +skcipher_request_zero (req); }else {preempt_disable ();pagefault_disable ();
Signature · 1 line
2.9.3
Herbert Xu
maintainerQuoted 2 lines · Paulo Flabiano Smorigo
Signed-off-by Paulo Flabiano Smorigo <[email protected]>---
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt