Commit 14aa1a83 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: algapi - remove crypto_alloc_instance() 



Now that all "blkcipher" templates have been converted to "skcipher",
crypto_alloc_instance() is no longer used.  And it's not useful any
longer as it creates an old-style weakly typed instance rather than a
new-style strongly typed instance.  So remove it, and now that the name
is freed up rename crypto_alloc_instance2() to crypto_alloc_instance().

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 31d40c20

crypto/algapi.c

+2 −31
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ int crypto_inst_setname(struct crypto_instance *inst, const char *name, 
}

EXPORT_SYMBOL_GPL(crypto_inst_setname);



void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,

void *crypto_alloc_instance(const char *name, struct crypto_alg *alg,

			    unsigned int head)

{

	struct crypto_instance *inst;
@@ -869,35 +869,6 @@ err_free_inst: 
	kfree(p);

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(crypto_alloc_instance2);



struct crypto_instance *crypto_alloc_instance(const char *name,

					      struct crypto_alg *alg)

{

	struct crypto_instance *inst;

	struct crypto_spawn *spawn;

	int err;



	inst = crypto_alloc_instance2(name, alg, 0);

	if (IS_ERR(inst))

		goto out;



	spawn = crypto_instance_ctx(inst);

	err = crypto_init_spawn(spawn, alg, inst,

				CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);



	if (err)

		goto err_free_inst;



	return inst;



err_free_inst:

	kfree(inst);

	inst = ERR_PTR(err);



out:

	return inst;

}

EXPORT_SYMBOL_GPL(crypto_alloc_instance);



void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen)

include/crypto/algapi.h

+2 −4
Original line number Diff line number Diff line
@@ -185,10 +185,8 @@ static inline struct crypto_alg *crypto_attr_alg(struct rtattr *rta, 
int crypto_attr_u32(struct rtattr *rta, u32 *num);

int crypto_inst_setname(struct crypto_instance *inst, const char *name,

			struct crypto_alg *alg);

void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,

void *crypto_alloc_instance(const char *name, struct crypto_alg *alg,

			    unsigned int head);

struct crypto_instance *crypto_alloc_instance(const char *name,

					      struct crypto_alg *alg);



void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen);

int crypto_enqueue_request(struct crypto_queue *queue,

include/crypto/internal/hash.h

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static inline unsigned int ahash_instance_headroom(void) 
static inline struct ahash_instance *ahash_alloc_instance(

	const char *name, struct crypto_alg *alg)

{

	return crypto_alloc_instance2(name, alg, ahash_instance_headroom());

	return crypto_alloc_instance(name, alg, ahash_instance_headroom());

}



static inline void ahash_request_complete(struct ahash_request *req, int err)
@@ -233,7 +233,7 @@ static inline void *shash_instance_ctx(struct shash_instance *inst) 
static inline struct shash_instance *shash_alloc_instance(

	const char *name, struct crypto_alg *alg)

{

	return crypto_alloc_instance2(name, alg,

	return crypto_alloc_instance(name, alg,

				     sizeof(struct shash_alg) - sizeof(*alg));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE