Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a01d0ee authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: skcipher - Remove top-level givcipher interface 



This patch removes the old crypto_grab_skcipher helper and replaces
it with crypto_grab_skcipher2.

As this is the final entry point into givcipher this patch also
removes all traces of the top-level givcipher interface, including
all implicit IV generators such as chainiv.

The bottom-level givcipher interface remains until the drivers
using it are converted.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6cf80a29

crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ crypto_blkcipher-y := ablkcipher.o 
crypto_blkcipher-y += blkcipher.o

crypto_blkcipher-y += skcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o

obj-$(CONFIG_CRYPTO_ECHAINIV) += echainiv.o

crypto/ablkcipher.c

+0 −222
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <crypto/internal/skcipher.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/rtnetlink.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/seq_file.h>

#include <linux/cryptouser.h>
@@ -348,16 +346,6 @@ static unsigned int crypto_ablkcipher_ctxsize(struct crypto_alg *alg, u32 type, 
	return alg->cra_ctxsize;

}



int skcipher_null_givencrypt(struct skcipher_givcrypt_request *req)

{

	return crypto_ablkcipher_encrypt(&req->creq);

}



int skcipher_null_givdecrypt(struct skcipher_givcrypt_request *req)

{

	return crypto_ablkcipher_decrypt(&req->creq);

}



static int crypto_init_ablkcipher_ops(struct crypto_tfm *tfm, u32 type,

				      u32 mask)

{
@@ -370,10 +358,6 @@ static int crypto_init_ablkcipher_ops(struct crypto_tfm *tfm, u32 type, 
	crt->setkey = setkey;

	crt->encrypt = alg->encrypt;

	crt->decrypt = alg->decrypt;

	if (!alg->ivsize) {

		crt->givencrypt = skcipher_null_givencrypt;

		crt->givdecrypt = skcipher_null_givdecrypt;

	}

	crt->base = __crypto_ablkcipher_cast(tfm);

	crt->ivsize = alg->ivsize;
@@ -435,11 +419,6 @@ const struct crypto_type crypto_ablkcipher_type = { 
};

EXPORT_SYMBOL_GPL(crypto_ablkcipher_type);



static int no_givdecrypt(struct skcipher_givcrypt_request *req)

{

	return -ENOSYS;

}



static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type,

				      u32 mask)

{
@@ -453,8 +432,6 @@ static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type, 
		      alg->setkey : setkey;

	crt->encrypt = alg->encrypt;

	crt->decrypt = alg->decrypt;

	crt->givencrypt = alg->givencrypt ?: no_givdecrypt;

	crt->givdecrypt = alg->givdecrypt ?: no_givdecrypt;

	crt->base = __crypto_ablkcipher_cast(tfm);

	crt->ivsize = alg->ivsize;
@@ -515,202 +492,3 @@ const struct crypto_type crypto_givcipher_type = { 
	.report = crypto_givcipher_report,

};

EXPORT_SYMBOL_GPL(crypto_givcipher_type);
 


const char *crypto_default_geniv(const struct crypto_alg *alg)

{

	if (((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	     CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :

					 alg->cra_ablkcipher.ivsize) !=

	    alg->cra_blocksize)

		return "chainiv";



	return "eseqiv";

}



static int crypto_givcipher_default(struct crypto_alg *alg, u32 type, u32 mask)

{

	struct rtattr *tb[3];

	struct {

		struct rtattr attr;

		struct crypto_attr_type data;

	} ptype;

	struct {

		struct rtattr attr;

		struct crypto_attr_alg data;

	} palg;

	struct crypto_template *tmpl;

	struct crypto_instance *inst;

	struct crypto_alg *larval;

	const char *geniv;

	int err;



	larval = crypto_larval_lookup(alg->cra_driver_name,

				      (type & ~CRYPTO_ALG_TYPE_MASK) |

				      CRYPTO_ALG_TYPE_GIVCIPHER,

				      mask | CRYPTO_ALG_TYPE_MASK);

	err = PTR_ERR(larval);

	if (IS_ERR(larval))

		goto out;



	err = -EAGAIN;

	if (!crypto_is_larval(larval))

		goto drop_larval;



	ptype.attr.rta_len = sizeof(ptype);

	ptype.attr.rta_type = CRYPTOA_TYPE;

	ptype.data.type = type | CRYPTO_ALG_GENIV;

	/* GENIV tells the template that we're making a default geniv. */

	ptype.data.mask = mask | CRYPTO_ALG_GENIV;

	tb[0] = &ptype.attr;



	palg.attr.rta_len = sizeof(palg);

	palg.attr.rta_type = CRYPTOA_ALG;

	/* Must use the exact name to locate ourselves. */

	memcpy(palg.data.name, alg->cra_driver_name, CRYPTO_MAX_ALG_NAME);

	tb[1] = &palg.attr;



	tb[2] = NULL;



	if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	    CRYPTO_ALG_TYPE_BLKCIPHER)

		geniv = alg->cra_blkcipher.geniv;

	else

		geniv = alg->cra_ablkcipher.geniv;



	if (!geniv)

		geniv = crypto_default_geniv(alg);



	tmpl = crypto_lookup_template(geniv);

	err = -ENOENT;

	if (!tmpl)

		goto kill_larval;



	if (tmpl->create) {

		err = tmpl->create(tmpl, tb);

		if (err)

			goto put_tmpl;

		goto ok;

	}



	inst = tmpl->alloc(tb);

	err = PTR_ERR(inst);

	if (IS_ERR(inst))

		goto put_tmpl;



	err = crypto_register_instance(tmpl, inst);

	if (err) {

		tmpl->free(inst);

		goto put_tmpl;

	}



ok:

	/* Redo the lookup to use the instance we just registered. */

	err = -EAGAIN;



put_tmpl:

	crypto_tmpl_put(tmpl);

kill_larval:

	crypto_larval_kill(larval);

drop_larval:

	crypto_mod_put(larval);

out:

	crypto_mod_put(alg);

	return err;

}



struct crypto_alg *crypto_lookup_skcipher(const char *name, u32 type, u32 mask)

{

	struct crypto_alg *alg;



	alg = crypto_alg_mod_lookup(name, type, mask);

	if (IS_ERR(alg))

		return alg;



	if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	    CRYPTO_ALG_TYPE_GIVCIPHER)

		return alg;



	if (!((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	      CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :

					  alg->cra_ablkcipher.ivsize))

		return alg;



	crypto_mod_put(alg);

	alg = crypto_alg_mod_lookup(name, type | CRYPTO_ALG_TESTED,

				    mask & ~CRYPTO_ALG_TESTED);

	if (IS_ERR(alg))

		return alg;



	if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	    CRYPTO_ALG_TYPE_GIVCIPHER) {

		if (~alg->cra_flags & (type ^ ~mask) & CRYPTO_ALG_TESTED) {

			crypto_mod_put(alg);

			alg = ERR_PTR(-ENOENT);

		}

		return alg;

	}



	BUG_ON(!((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

		 CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :

					     alg->cra_ablkcipher.ivsize));



	return ERR_PTR(crypto_givcipher_default(alg, type, mask));

}

EXPORT_SYMBOL_GPL(crypto_lookup_skcipher);



int crypto_grab_skcipher(struct crypto_skcipher_spawn *spawn, const char *name,

			 u32 type, u32 mask)

{

	struct crypto_alg *alg;

	int err;



	type = crypto_skcipher_type(type);

	mask = crypto_skcipher_mask(mask);



	alg = crypto_lookup_skcipher(name, type, mask);

	if (IS_ERR(alg))

		return PTR_ERR(alg);



	err = crypto_init_spawn(&spawn->base, alg, spawn->base.inst, mask);

	crypto_mod_put(alg);

	return err;

}

EXPORT_SYMBOL_GPL(crypto_grab_skcipher);



struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name,

						  u32 type, u32 mask)

{

	struct crypto_tfm *tfm;

	int err;



	type = crypto_skcipher_type(type);

	mask = crypto_skcipher_mask(mask);



	for (;;) {

		struct crypto_alg *alg;



		alg = crypto_lookup_skcipher(alg_name, type, mask);

		if (IS_ERR(alg)) {

			err = PTR_ERR(alg);

			goto err;

		}



		tfm = __crypto_alloc_tfm(alg, type, mask);

		if (!IS_ERR(tfm))

			return __crypto_ablkcipher_cast(tfm);



		crypto_mod_put(alg);

		err = PTR_ERR(tfm);



err:

		if (err != -EAGAIN)

			break;

		if (fatal_signal_pending(current)) {

			err = -EINTR;

			break;

		}

	}



	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(crypto_alloc_ablkcipher);

crypto/blkcipher.c

+0 −185
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/hardirq.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/scatterlist.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/string.h>
@@ -466,10 +465,6 @@ static int crypto_init_blkcipher_ops_async(struct crypto_tfm *tfm) 
	crt->setkey = async_setkey;

	crt->encrypt = async_encrypt;

	crt->decrypt = async_decrypt;

	if (!alg->ivsize) {

		crt->givencrypt = skcipher_null_givencrypt;

		crt->givdecrypt = skcipher_null_givdecrypt;

	}

	crt->base = __crypto_ablkcipher_cast(tfm);

	crt->ivsize = alg->ivsize;
@@ -560,185 +555,5 @@ const struct crypto_type crypto_blkcipher_type = { 
};

EXPORT_SYMBOL_GPL(crypto_blkcipher_type);



static int crypto_grab_nivcipher(struct crypto_skcipher_spawn *spawn,

				const char *name, u32 type, u32 mask)

{

	struct crypto_alg *alg;

	int err;



	type = crypto_skcipher_type(type);

	mask = crypto_skcipher_mask(mask)| CRYPTO_ALG_GENIV;



	alg = crypto_alg_mod_lookup(name, type, mask);

	if (IS_ERR(alg))

		return PTR_ERR(alg);



	err = crypto_init_spawn(&spawn->base, alg, spawn->base.inst, mask);

	crypto_mod_put(alg);

	return err;

}



struct crypto_instance *skcipher_geniv_alloc(struct crypto_template *tmpl,

					     struct rtattr **tb, u32 type,

					     u32 mask)

{

	struct {

		int (*setkey)(struct crypto_ablkcipher *tfm, const u8 *key,

			      unsigned int keylen);

		int (*encrypt)(struct ablkcipher_request *req);

		int (*decrypt)(struct ablkcipher_request *req);



		unsigned int min_keysize;

		unsigned int max_keysize;

		unsigned int ivsize;



		const char *geniv;

	} balg;

	const char *name;

	struct crypto_skcipher_spawn *spawn;

	struct crypto_attr_type *algt;

	struct crypto_instance *inst;

	struct crypto_alg *alg;

	int err;



	algt = crypto_get_attr_type(tb);

	if (IS_ERR(algt))

		return ERR_CAST(algt);



	if ((algt->type ^ (CRYPTO_ALG_TYPE_GIVCIPHER | CRYPTO_ALG_GENIV)) &

	    algt->mask)

		return ERR_PTR(-EINVAL);



	name = crypto_attr_alg_name(tb[1]);

	if (IS_ERR(name))

		return ERR_CAST(name);



	inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);

	if (!inst)

		return ERR_PTR(-ENOMEM);



	spawn = crypto_instance_ctx(inst);



	/* Ignore async algorithms if necessary. */

	mask |= crypto_requires_sync(algt->type, algt->mask);



	crypto_set_skcipher_spawn(spawn, inst);

	err = crypto_grab_nivcipher(spawn, name, type, mask);

	if (err)

		goto err_free_inst;



	alg = crypto_skcipher_spawn_alg(spawn);



	if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

	    CRYPTO_ALG_TYPE_BLKCIPHER) {

		balg.ivsize = alg->cra_blkcipher.ivsize;

		balg.min_keysize = alg->cra_blkcipher.min_keysize;

		balg.max_keysize = alg->cra_blkcipher.max_keysize;



		balg.setkey = async_setkey;

		balg.encrypt = async_encrypt;

		balg.decrypt = async_decrypt;



		balg.geniv = alg->cra_blkcipher.geniv;

	} else {

		balg.ivsize = alg->cra_ablkcipher.ivsize;

		balg.min_keysize = alg->cra_ablkcipher.min_keysize;

		balg.max_keysize = alg->cra_ablkcipher.max_keysize;



		balg.setkey = alg->cra_ablkcipher.setkey;

		balg.encrypt = alg->cra_ablkcipher.encrypt;

		balg.decrypt = alg->cra_ablkcipher.decrypt;



		balg.geniv = alg->cra_ablkcipher.geniv;

	}



	err = -EINVAL;

	if (!balg.ivsize)

		goto err_drop_alg;



	/*

	 * This is only true if we're constructing an algorithm with its

	 * default IV generator.  For the default generator we elide the

	 * template name and double-check the IV generator.

	 */

	if (algt->mask & CRYPTO_ALG_GENIV) {

		if (!balg.geniv)

			balg.geniv = crypto_default_geniv(alg);

		err = -EAGAIN;

		if (strcmp(tmpl->name, balg.geniv))

			goto err_drop_alg;



		memcpy(inst->alg.cra_name, alg->cra_name, CRYPTO_MAX_ALG_NAME);

		memcpy(inst->alg.cra_driver_name, alg->cra_driver_name,

		       CRYPTO_MAX_ALG_NAME);

	} else {

		err = -ENAMETOOLONG;

		if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME,

			     "%s(%s)", tmpl->name, alg->cra_name) >=

		    CRYPTO_MAX_ALG_NAME)

			goto err_drop_alg;

		if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,

			     "%s(%s)", tmpl->name, alg->cra_driver_name) >=

		    CRYPTO_MAX_ALG_NAME)

			goto err_drop_alg;

	}



	inst->alg.cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER | CRYPTO_ALG_GENIV;

	inst->alg.cra_flags |= alg->cra_flags & CRYPTO_ALG_ASYNC;

	inst->alg.cra_priority = alg->cra_priority;

	inst->alg.cra_blocksize = alg->cra_blocksize;

	inst->alg.cra_alignmask = alg->cra_alignmask;

	inst->alg.cra_type = &crypto_givcipher_type;



	inst->alg.cra_ablkcipher.ivsize = balg.ivsize;

	inst->alg.cra_ablkcipher.min_keysize = balg.min_keysize;

	inst->alg.cra_ablkcipher.max_keysize = balg.max_keysize;

	inst->alg.cra_ablkcipher.geniv = balg.geniv;



	inst->alg.cra_ablkcipher.setkey = balg.setkey;

	inst->alg.cra_ablkcipher.encrypt = balg.encrypt;

	inst->alg.cra_ablkcipher.decrypt = balg.decrypt;



out:

	return inst;



err_drop_alg:

	crypto_drop_skcipher(spawn);

err_free_inst:

	kfree(inst);

	inst = ERR_PTR(err);

	goto out;

}

EXPORT_SYMBOL_GPL(skcipher_geniv_alloc);



void skcipher_geniv_free(struct crypto_instance *inst)

{

	crypto_drop_skcipher(crypto_instance_ctx(inst));

	kfree(inst);

}

EXPORT_SYMBOL_GPL(skcipher_geniv_free);



int skcipher_geniv_init(struct crypto_tfm *tfm)

{

	struct crypto_instance *inst = (void *)tfm->__crt_alg;

	struct crypto_ablkcipher *cipher;



	cipher = crypto_spawn_skcipher(crypto_instance_ctx(inst));

	if (IS_ERR(cipher))

		return PTR_ERR(cipher);



	tfm->crt_ablkcipher.base = cipher;

	tfm->crt_ablkcipher.reqsize += crypto_ablkcipher_reqsize(cipher);



	return 0;

}

EXPORT_SYMBOL_GPL(skcipher_geniv_init);



void skcipher_geniv_exit(struct crypto_tfm *tfm)

{

	crypto_free_ablkcipher(tfm->crt_ablkcipher.base);

}

EXPORT_SYMBOL_GPL(skcipher_geniv_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Generic block chaining cipher type");

crypto/chainiv.c

deleted100644 → 0
+0 −317
Original line number Diff line number Diff line 
/*

 * chainiv: Chain IV Generator

 *

 * Generate IVs simply be using the last block of the previous encryption.

 * This is mainly useful for CBC with a synchronous algorithm.

 *

 * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

 * Software Foundation; either version 2 of the License, or (at your option)

 * any later version.

 *

 */



#include <crypto/internal/skcipher.h>

#include <crypto/rng.h>

#include <crypto/crypto_wq.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <linux/string.h>

#include <linux/workqueue.h>



enum {

	CHAINIV_STATE_INUSE = 0,

};



struct chainiv_ctx {

	spinlock_t lock;

	char iv[];

};



struct async_chainiv_ctx {

	unsigned long state;



	spinlock_t lock;

	int err;



	struct crypto_queue queue;

	struct work_struct postponed;



	char iv[];

};



static int chainiv_givencrypt(struct skcipher_givcrypt_request *req)

{

	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);

	struct chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);

	struct ablkcipher_request *subreq = skcipher_givcrypt_reqctx(req);

	unsigned int ivsize;

	int err;



	ablkcipher_request_set_tfm(subreq, skcipher_geniv_cipher(geniv));

	ablkcipher_request_set_callback(subreq, req->creq.base.flags &

						~CRYPTO_TFM_REQ_MAY_SLEEP,

					req->creq.base.complete,

					req->creq.base.data);

	ablkcipher_request_set_crypt(subreq, req->creq.src, req->creq.dst,

				     req->creq.nbytes, req->creq.info);



	spin_lock_bh(&ctx->lock);



	ivsize = crypto_ablkcipher_ivsize(geniv);



	memcpy(req->giv, ctx->iv, ivsize);

	memcpy(subreq->info, ctx->iv, ivsize);



	err = crypto_ablkcipher_encrypt(subreq);

	if (err)

		goto unlock;



	memcpy(ctx->iv, subreq->info, ivsize);



unlock:

	spin_unlock_bh(&ctx->lock);



	return err;

}



static int chainiv_init_common(struct crypto_tfm *tfm, char iv[])

{

	struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);

	int err = 0;



	tfm->crt_ablkcipher.reqsize = sizeof(struct ablkcipher_request);



	if (iv) {

		err = crypto_rng_get_bytes(crypto_default_rng, iv,

					   crypto_ablkcipher_ivsize(geniv));

		crypto_put_default_rng();

	}



	return err ?: skcipher_geniv_init(tfm);

}



static int chainiv_init(struct crypto_tfm *tfm)

{

	struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);

	struct chainiv_ctx *ctx = crypto_tfm_ctx(tfm);

	char *iv;



	spin_lock_init(&ctx->lock);



	iv = NULL;

	if (!crypto_get_default_rng()) {

		crypto_ablkcipher_crt(geniv)->givencrypt = chainiv_givencrypt;

		iv = ctx->iv;

	}



	return chainiv_init_common(tfm, iv);

}



static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx)

{

	int queued;

	int err = ctx->err;



	if (!ctx->queue.qlen) {

		smp_mb__before_atomic();

		clear_bit(CHAINIV_STATE_INUSE, &ctx->state);



		if (!ctx->queue.qlen ||

		    test_and_set_bit(CHAINIV_STATE_INUSE, &ctx->state))

			goto out;

	}



	queued = queue_work(kcrypto_wq, &ctx->postponed);

	BUG_ON(!queued);



out:

	return err;

}



static int async_chainiv_postpone_request(struct skcipher_givcrypt_request *req)

{

	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);

	struct async_chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);

	int err;



	spin_lock_bh(&ctx->lock);

	err = skcipher_enqueue_givcrypt(&ctx->queue, req);

	spin_unlock_bh(&ctx->lock);



	if (test_and_set_bit(CHAINIV_STATE_INUSE, &ctx->state))

		return err;



	ctx->err = err;

	return async_chainiv_schedule_work(ctx);

}



static int async_chainiv_givencrypt_tail(struct skcipher_givcrypt_request *req)

{

	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);

	struct async_chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);

	struct ablkcipher_request *subreq = skcipher_givcrypt_reqctx(req);

	unsigned int ivsize = crypto_ablkcipher_ivsize(geniv);



	memcpy(req->giv, ctx->iv, ivsize);

	memcpy(subreq->info, ctx->iv, ivsize);



	ctx->err = crypto_ablkcipher_encrypt(subreq);

	if (ctx->err)

		goto out;



	memcpy(ctx->iv, subreq->info, ivsize);



out:

	return async_chainiv_schedule_work(ctx);

}



static int async_chainiv_givencrypt(struct skcipher_givcrypt_request *req)

{

	struct crypto_ablkcipher *geniv = skcipher_givcrypt_reqtfm(req);

	struct async_chainiv_ctx *ctx = crypto_ablkcipher_ctx(geniv);

	struct ablkcipher_request *subreq = skcipher_givcrypt_reqctx(req);



	ablkcipher_request_set_tfm(subreq, skcipher_geniv_cipher(geniv));

	ablkcipher_request_set_callback(subreq, req->creq.base.flags,

					req->creq.base.complete,

					req->creq.base.data);

	ablkcipher_request_set_crypt(subreq, req->creq.src, req->creq.dst,

				     req->creq.nbytes, req->creq.info);



	if (test_and_set_bit(CHAINIV_STATE_INUSE, &ctx->state))

		goto postpone;



	if (ctx->queue.qlen) {

		clear_bit(CHAINIV_STATE_INUSE, &ctx->state);

		goto postpone;

	}



	return async_chainiv_givencrypt_tail(req);



postpone:

	return async_chainiv_postpone_request(req);

}



static void async_chainiv_do_postponed(struct work_struct *work)

{

	struct async_chainiv_ctx *ctx = container_of(work,

						     struct async_chainiv_ctx,

						     postponed);

	struct skcipher_givcrypt_request *req;

	struct ablkcipher_request *subreq;

	int err;



	/* Only handle one request at a time to avoid hogging keventd. */

	spin_lock_bh(&ctx->lock);

	req = skcipher_dequeue_givcrypt(&ctx->queue);

	spin_unlock_bh(&ctx->lock);



	if (!req) {

		async_chainiv_schedule_work(ctx);

		return;

	}



	subreq = skcipher_givcrypt_reqctx(req);

	subreq->base.flags |= CRYPTO_TFM_REQ_MAY_SLEEP;



	err = async_chainiv_givencrypt_tail(req);



	local_bh_disable();

	skcipher_givcrypt_complete(req, err);

	local_bh_enable();

}



static int async_chainiv_init(struct crypto_tfm *tfm)

{

	struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);

	struct async_chainiv_ctx *ctx = crypto_tfm_ctx(tfm);

	char *iv;



	spin_lock_init(&ctx->lock);



	crypto_init_queue(&ctx->queue, 100);

	INIT_WORK(&ctx->postponed, async_chainiv_do_postponed);



	iv = NULL;

	if (!crypto_get_default_rng()) {

		crypto_ablkcipher_crt(geniv)->givencrypt =

			async_chainiv_givencrypt;

		iv = ctx->iv;

	}



	return chainiv_init_common(tfm, iv);

}



static void async_chainiv_exit(struct crypto_tfm *tfm)

{

	struct async_chainiv_ctx *ctx = crypto_tfm_ctx(tfm);



	BUG_ON(test_bit(CHAINIV_STATE_INUSE, &ctx->state) || ctx->queue.qlen);



	skcipher_geniv_exit(tfm);

}



static struct crypto_template chainiv_tmpl;



static struct crypto_instance *chainiv_alloc(struct rtattr **tb)

{

	struct crypto_attr_type *algt;

	struct crypto_instance *inst;



	algt = crypto_get_attr_type(tb);

	if (IS_ERR(algt))

		return ERR_CAST(algt);



	inst = skcipher_geniv_alloc(&chainiv_tmpl, tb, 0, 0);

	if (IS_ERR(inst))

		goto out;



	inst->alg.cra_init = chainiv_init;

	inst->alg.cra_exit = skcipher_geniv_exit;



	inst->alg.cra_ctxsize = sizeof(struct chainiv_ctx);



	if (!crypto_requires_sync(algt->type, algt->mask)) {

		inst->alg.cra_flags |= CRYPTO_ALG_ASYNC;



		inst->alg.cra_init = async_chainiv_init;

		inst->alg.cra_exit = async_chainiv_exit;



		inst->alg.cra_ctxsize = sizeof(struct async_chainiv_ctx);

	}



	inst->alg.cra_ctxsize += inst->alg.cra_ablkcipher.ivsize;



out:

	return inst;

}



static struct crypto_template chainiv_tmpl = {

	.name = "chainiv",

	.alloc = chainiv_alloc,

	.free = skcipher_geniv_free,

	.module = THIS_MODULE,

};



static int __init chainiv_module_init(void)

{

	return crypto_register_template(&chainiv_tmpl);

}



static void chainiv_module_exit(void)

{

	crypto_unregister_template(&chainiv_tmpl);

}



module_init(chainiv_module_init);

module_exit(chainiv_module_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Chain IV Generator");

MODULE_ALIAS_CRYPTO("chainiv");

crypto/eseqiv.c

deleted100644 → 0
+0 −242

File deleted.

Preview size limit exceeded, changes collapsed.