Commit 6cf80a29 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: user - Remove crypto_lookup_skcipher call 



As there are no more kernel users of built-in IV generators we
can remove the special lookup for skciphers.

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

crypto/crypto_user.c

+1 −36
Original line number Diff line number Diff line
@@ -378,32 +378,6 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	return err;

}



static struct crypto_alg *crypto_user_skcipher_alg(const char *name, u32 type,

						   u32 mask)

{

	int err;

	struct crypto_alg *alg;



	type = crypto_skcipher_type(type);

	mask = crypto_skcipher_mask(mask);



	for (;;) {

		alg = crypto_lookup_skcipher(name,  type, mask);

		if (!IS_ERR(alg))

			return alg;



		err = PTR_ERR(alg);

		if (err != -EAGAIN)

			break;

		if (fatal_signal_pending(current)) {

			err = -EINTR;

			break;

		}

	}



	return ERR_PTR(err);

}



static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,

			  struct nlattr **attrs)

{
@@ -436,16 +410,7 @@ static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	else

		name = p->cru_name;



	switch (p->cru_type & p->cru_mask & CRYPTO_ALG_TYPE_MASK) {

	case CRYPTO_ALG_TYPE_GIVCIPHER:

	case CRYPTO_ALG_TYPE_BLKCIPHER:

	case CRYPTO_ALG_TYPE_ABLKCIPHER:

		alg = crypto_user_skcipher_alg(name, p->cru_type, p->cru_mask);

		break;

	default:

	alg = crypto_alg_mod_lookup(name, p->cru_type, p->cru_mask);

	}



	if (IS_ERR(alg))

		return PTR_ERR(alg);