crypto: cipher - make crypto_spawn_cipher() take a crypto_cipher_spawn

Now that all users of single-block cipher spawns have been converted to
use 'struct crypto_cipher_spawn' rather than the less specifically typed
'struct crypto_spawn', make crypto_spawn_cipher() take a pointer to a
'struct crypto_cipher_spawn' rather than a 'struct crypto_spawn'.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index 5b8aa14..4d7a6ca 100644 (file)
--- a/crypto/adiantum.c
+++ b/crypto/adiantum.c
@@ -408,7 +408,7 @@ static int adiantum_init_tfm(struct crypto_skcipher *tfm)
        if (IS_ERR(streamcipher))
                return PTR_ERR(streamcipher);
 
-       blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn.base);
+       blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn);
        if (IS_ERR(blockcipher)) {
                err = PTR_ERR(blockcipher);
                goto err_free_streamcipher;

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 411c397..f4abaef 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -866,7 +866,7 @@ static int cbcmac_init_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_cipher *cipher;
        struct crypto_instance *inst = (void *)tfm->__crt_alg;
-       struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
        struct cbcmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
 
        cipher = crypto_spawn_cipher(spawn);

diff --git a/crypto/cmac.c b/crypto/cmac.c
index c6bf78b..58dc644 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -201,7 +201,7 @@ static int cmac_init_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_cipher *cipher;
        struct crypto_instance *inst = (void *)tfm->__crt_alg;
-       struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
        struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
 
        cipher = crypto_spawn_cipher(spawn);

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 950ff14..42add1e 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -887,7 +887,7 @@ static int skcipher_setkey_simple(struct crypto_skcipher *tfm, const u8 *key,
 static int skcipher_init_tfm_simple(struct crypto_skcipher *tfm)
 {
        struct skcipher_instance *inst = skcipher_alg_instance(tfm);
-       struct crypto_spawn *spawn = skcipher_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = skcipher_instance_ctx(inst);
        struct skcipher_ctx_simple *ctx = crypto_skcipher_ctx(tfm);
        struct crypto_cipher *cipher;
 

diff --git a/crypto/vmac.c b/crypto/vmac.c
index 9b000aa..28358a6 100644 (file)
--- a/crypto/vmac.c
+++ b/crypto/vmac.c
@@ -596,7 +596,7 @@ static int vmac_final(struct shash_desc *desc, u8 *out)
 static int vmac_init_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);
-       struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
        struct vmac_tfm_ctx *tctx = crypto_tfm_ctx(tfm);
        struct crypto_cipher *cipher;
 

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 9b97fa5..9265e00 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -167,7 +167,7 @@ static int xcbc_init_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_cipher *cipher;
        struct crypto_instance *inst = (void *)tfm->__crt_alg;
-       struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
        struct xcbc_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
 
        cipher = crypto_spawn_cipher(spawn);

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 7705387..bbf85a8 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -234,12 +234,12 @@ static inline struct crypto_alg *crypto_spawn_cipher_alg(
 }
 
 static inline struct crypto_cipher *crypto_spawn_cipher(
-       struct crypto_spawn *spawn)
+       struct crypto_cipher_spawn *spawn)
 {
        u32 type = CRYPTO_ALG_TYPE_CIPHER;
        u32 mask = CRYPTO_ALG_TYPE_MASK;
 
-       return __crypto_cipher_cast(crypto_spawn_tfm(spawn, type, mask));
+       return __crypto_cipher_cast(crypto_spawn_tfm(&spawn->base, type, mask));
 }
 
 static inline struct cipher_alg *crypto_cipher_alg(struct crypto_cipher *tfm)