Commit 21dbd96f authored Jun 21, 2015 by Herbert Xu

crypto: skcipher - Allow givencrypt to be NULL



Currently for skcipher IV generators they must provide givencrypt
as that is the whole point.  We are currently replacing skcipher
IV generators with explicit IV generators.  In order to maintain
backwards compatibility, we need to allow the IV generators to
still function as a normal skcipher when the RNG Is not present
(e.g., in the initramfs during boot).  IOW everything but givencrypt
and givdecrypt will still work but those two will fail.

Therefore this patch assigns a default givencrypt that simply
returns an error should it be NULL.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 7eac7144

crypto/ablkcipher.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -454,7 +454,7 @@ static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type,
	alg->setkey : setkey;		alg->setkey : setkey;
	crt->encrypt = alg->encrypt;		crt->encrypt = alg->encrypt;
	crt->decrypt = alg->decrypt;		crt->decrypt = alg->decrypt;
	crt->givencrypt = alg->givencrypt;		crt->givencrypt = alg->givencrypt ?: no_givdecrypt;
	crt->givdecrypt = alg->givdecrypt ?: no_givdecrypt;		crt->givdecrypt = alg->givdecrypt ?: no_givdecrypt;
	crt->base = __crypto_ablkcipher_cast(tfm);		crt->base = __crypto_ablkcipher_cast(tfm);
	crt->ivsize = alg->ivsize;		crt->ivsize = alg->ivsize;

Admin message