Commit f384cdc4 authored Oct 06, 2017 by LEROY Christophe Committed by Herbert Xu Oct 12, 2017

crypto: talitos - fix setkey to check key weakness



Crypto manager test report the following failures:
[    3.061081] alg: skcipher: setkey failed on test 5 for ecb-des-talitos: flags=100
[    3.069342] alg: skcipher-ddst: setkey failed on test 5 for ecb-des-talitos: flags=100
[    3.077754] alg: skcipher-ddst: setkey failed on test 5 for ecb-des-talitos: flags=100

This is due to setkey being expected to detect weak keys.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent e04a61be

drivers/crypto/talitos.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1507,12 +1507,20 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,
		const u8 *key, unsigned int keylen)
		{
		struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);
		u32 tmp[DES_EXPKEY_WORDS];

		if (keylen > TALITOS_MAX_KEY_SIZE) {
		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
		return -EINVAL;
		}

		if (unlikely(crypto_ablkcipher_get_flags(cipher) &
		CRYPTO_TFM_REQ_WEAK_KEY) &&
		!des_ekey(tmp, key)) {
		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_WEAK_KEY);
		return -EINVAL;
		}

		memcpy(&ctx->key, key, keylen);
		ctx->keylen = keylen;