Commit 7c2aed4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] api: Select cryptomgr where needed
  [CRYPTO] api: fix crypto_alloc_base() return value
parents adfefb55 43518407

crypto/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ config CRYPTO_HASH 
config CRYPTO_MANAGER

	tristate "Cryptographic algorithm manager"

	select CRYPTO_ALGAPI

	default m

	help

	  Create default cryptographic template instantiations such as

	  cbc(aes).
@@ -35,6 +34,7 @@ config CRYPTO_MANAGER 
config CRYPTO_HMAC

	tristate "HMAC support"

	select CRYPTO_HASH

	select CRYPTO_MANAGER

	help

	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).

	  This is required for IPSec.
@@ -131,6 +131,7 @@ config CRYPTO_TGR192 
config CRYPTO_ECB

	tristate "ECB support"

	select CRYPTO_BLKCIPHER

	select CRYPTO_MANAGER

	default m

	help

	  ECB: Electronic CodeBook mode
@@ -140,6 +141,7 @@ config CRYPTO_ECB 
config CRYPTO_CBC

	tristate "CBC support"

	select CRYPTO_BLKCIPHER

	select CRYPTO_MANAGER

	default m

	help

	  CBC: Cipher Block Chaining mode

crypto/api.c

+8 −7
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 flags) 
	tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags);

	tfm = kzalloc(tfm_size, GFP_KERNEL);

	if (tfm == NULL)

		goto out;

		goto out_err;



	tfm->__crt_alg = alg;
@@ -355,6 +355,7 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 flags) 
	crypto_exit_ops(tfm);

out_free_tfm:

	kfree(tfm);

out_err:

	tfm = ERR_PTR(err);

out:

	return tfm;
@@ -414,14 +415,14 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) 
		struct crypto_alg *alg;



		alg = crypto_alg_mod_lookup(alg_name, type, mask);

		if (IS_ERR(alg)) {

			err = PTR_ERR(alg);

		tfm = ERR_PTR(err);

		if (IS_ERR(alg))

			goto err;

		}



		tfm = __crypto_alloc_tfm(alg, 0);

		if (!IS_ERR(tfm))

			break;

			return tfm;



		crypto_mod_put(alg);

		err = PTR_ERR(tfm);
@@ -433,9 +434,9 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) 
			err = -EINTR;

			break;

		}

	};

	}



	return tfm;

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(crypto_alloc_base);