tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Eric Biggers and committed by
Herbert Xu d5ed3b65 1e212a6a

+8 -8
+1 -1
crypto/adiantum.c
··· 408 408 if (IS_ERR(streamcipher)) 409 409 return PTR_ERR(streamcipher); 410 410 411 - blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn.base); 411 + blockcipher = crypto_spawn_cipher(&ictx->blockcipher_spawn); 412 412 if (IS_ERR(blockcipher)) { 413 413 err = PTR_ERR(blockcipher); 414 414 goto err_free_streamcipher;
+1 -1
crypto/ccm.c
··· 866 866 { 867 867 struct crypto_cipher *cipher; 868 868 struct crypto_instance *inst = (void *)tfm->__crt_alg; 869 - struct crypto_spawn *spawn = crypto_instance_ctx(inst); 869 + struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst); 870 870 struct cbcmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm); 871 871 872 872 cipher = crypto_spawn_cipher(spawn);
+1 -1
crypto/cmac.c
··· 201 201 { 202 202 struct crypto_cipher *cipher; 203 203 struct crypto_instance *inst = (void *)tfm->__crt_alg; 204 - struct crypto_spawn *spawn = crypto_instance_ctx(inst); 204 + struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst); 205 205 struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm); 206 206 207 207 cipher = crypto_spawn_cipher(spawn);
+1 -1
crypto/skcipher.c
··· 887 887 static int skcipher_init_tfm_simple(struct crypto_skcipher *tfm) 888 888 { 889 889 struct skcipher_instance *inst = skcipher_alg_instance(tfm); 890 - struct crypto_spawn *spawn = skcipher_instance_ctx(inst); 890 + struct crypto_cipher_spawn *spawn = skcipher_instance_ctx(inst); 891 891 struct skcipher_ctx_simple *ctx = crypto_skcipher_ctx(tfm); 892 892 struct crypto_cipher *cipher; 893 893
+1 -1
crypto/vmac.c
··· 596 596 static int vmac_init_tfm(struct crypto_tfm *tfm) 597 597 { 598 598 struct crypto_instance *inst = crypto_tfm_alg_instance(tfm); 599 - struct crypto_spawn *spawn = crypto_instance_ctx(inst); 599 + struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst); 600 600 struct vmac_tfm_ctx *tctx = crypto_tfm_ctx(tfm); 601 601 struct crypto_cipher *cipher; 602 602
+1 -1
crypto/xcbc.c
··· 167 167 { 168 168 struct crypto_cipher *cipher; 169 169 struct crypto_instance *inst = (void *)tfm->__crt_alg; 170 - struct crypto_spawn *spawn = crypto_instance_ctx(inst); 170 + struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst); 171 171 struct xcbc_tfm_ctx *ctx = crypto_tfm_ctx(tfm); 172 172 173 173 cipher = crypto_spawn_cipher(spawn);
+2 -2
include/crypto/algapi.h
··· 234 234 } 235 235 236 236 static inline struct crypto_cipher *crypto_spawn_cipher( 237 - struct crypto_spawn *spawn) 237 + struct crypto_cipher_spawn *spawn) 238 238 { 239 239 u32 type = CRYPTO_ALG_TYPE_CIPHER; 240 240 u32 mask = CRYPTO_ALG_TYPE_MASK; 241 241 242 - return __crypto_cipher_cast(crypto_spawn_tfm(spawn, type, mask)); 242 + return __crypto_cipher_cast(crypto_spawn_tfm(&spawn->base, type, mask)); 243 243 } 244 244 245 245 static inline struct cipher_alg *crypto_cipher_alg(struct crypto_cipher *tfm)