Commit af5034e8 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: remove propagation of CRYPTO_TFM_RES_* flags 



The CRYPTO_TFM_RES_* flags were apparently meant as a way to make the
->setkey() functions provide more information about errors.  But these
flags weren't actually being used or tested, and in many cases they
weren't being set correctly anyway.  So they've now been removed.

Also, if someone ever actually needs to start better distinguishing
->setkey() errors (which is somewhat unlikely, as this has been unneeded
for a long time), we'd be much better off just defining different return
values, like -EINVAL if the key is invalid for the algorithm vs.
-EKEYREJECTED if the key was rejected by a policy like "no weak keys".
That would be much simpler, less error-prone, and easier to test.

So just remove CRYPTO_TFM_RES_MASK and all the unneeded logic that
propagates these flags around.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c4c4db0d

arch/arm/crypto/ghash-ce-glue.c

+1 −6
Original line number Diff line number Diff line
@@ -294,16 +294,11 @@ static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key, 
{

	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct crypto_ahash *child = &ctx->cryptd_tfm->base;

	int err;



	crypto_ahash_clear_flags(child, CRYPTO_TFM_REQ_MASK);

	crypto_ahash_set_flags(child, crypto_ahash_get_flags(tfm)

			       & CRYPTO_TFM_REQ_MASK);

	err = crypto_ahash_setkey(child, key, keylen);

	crypto_ahash_set_flags(tfm, crypto_ahash_get_flags(child)

			       & CRYPTO_TFM_RES_MASK);



	return err;

	return crypto_ahash_setkey(child, key, keylen);

}



static int ghash_async_init_tfm(struct crypto_tfm *tfm)

arch/s390/crypto/aes_s390.c

+3 −20
Original line number Diff line number Diff line
@@ -72,19 +72,12 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key, 
		unsigned int key_len)

{

	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);

	int ret;



	sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;

	sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &

			CRYPTO_TFM_REQ_MASK);



	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);

	if (ret) {

		tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;

		tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &

				CRYPTO_TFM_RES_MASK);

	}

	return ret;

	return crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);

}



static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
@@ -182,18 +175,13 @@ static int setkey_fallback_skcipher(struct crypto_skcipher *tfm, const u8 *key, 
				    unsigned int len)

{

	struct s390_aes_ctx *sctx = crypto_skcipher_ctx(tfm);

	int ret;



	crypto_skcipher_clear_flags(sctx->fallback.skcipher,

				    CRYPTO_TFM_REQ_MASK);

	crypto_skcipher_set_flags(sctx->fallback.skcipher,

				  crypto_skcipher_get_flags(tfm) &

				  CRYPTO_TFM_REQ_MASK);

	ret = crypto_skcipher_setkey(sctx->fallback.skcipher, key, len);

	crypto_skcipher_set_flags(tfm,

				  crypto_skcipher_get_flags(sctx->fallback.skcipher) &

				  CRYPTO_TFM_RES_MASK);

	return ret;

	return crypto_skcipher_setkey(sctx->fallback.skcipher, key, len);

}



static int fallback_skcipher_crypt(struct s390_aes_ctx *sctx,
@@ -389,17 +377,12 @@ static int xts_fallback_setkey(struct crypto_skcipher *tfm, const u8 *key, 
			       unsigned int len)

{

	struct s390_xts_ctx *xts_ctx = crypto_skcipher_ctx(tfm);

	int ret;



	crypto_skcipher_clear_flags(xts_ctx->fallback, CRYPTO_TFM_REQ_MASK);

	crypto_skcipher_set_flags(xts_ctx->fallback,

				  crypto_skcipher_get_flags(tfm) &

				  CRYPTO_TFM_REQ_MASK);

	ret = crypto_skcipher_setkey(xts_ctx->fallback, key, len);

	crypto_skcipher_set_flags(tfm,

				  crypto_skcipher_get_flags(xts_ctx->fallback) &

				  CRYPTO_TFM_RES_MASK);

	return ret;

	return crypto_skcipher_setkey(xts_ctx->fallback, key, len);

}



static int xts_aes_set_key(struct crypto_skcipher *tfm, const u8 *in_key,

arch/x86/crypto/ghash-clmulni-intel_glue.c

+1 −6
Original line number Diff line number Diff line
@@ -255,16 +255,11 @@ static int ghash_async_setkey(struct crypto_ahash *tfm, const u8 *key, 
{

	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct crypto_ahash *child = &ctx->cryptd_tfm->base;

	int err;



	crypto_ahash_clear_flags(child, CRYPTO_TFM_REQ_MASK);

	crypto_ahash_set_flags(child, crypto_ahash_get_flags(tfm)

			       & CRYPTO_TFM_REQ_MASK);

	err = crypto_ahash_setkey(child, key, keylen);

	crypto_ahash_set_flags(tfm, crypto_ahash_get_flags(child)

			       & CRYPTO_TFM_RES_MASK);



	return err;

	return crypto_ahash_setkey(child, key, keylen);

}



static int ghash_async_init_tfm(struct crypto_tfm *tfm)

crypto/adiantum.c

+0 −8
Original line number Diff line number Diff line
@@ -135,9 +135,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key, 
				  crypto_skcipher_get_flags(tfm) &

				  CRYPTO_TFM_REQ_MASK);

	err = crypto_skcipher_setkey(tctx->streamcipher, key, keylen);

	crypto_skcipher_set_flags(tfm,

				crypto_skcipher_get_flags(tctx->streamcipher) &

				CRYPTO_TFM_RES_MASK);

	if (err)

		return err;
@@ -167,9 +164,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key, 
				CRYPTO_TFM_REQ_MASK);

	err = crypto_cipher_setkey(tctx->blockcipher, keyp,

				   BLOCKCIPHER_KEY_SIZE);

	crypto_skcipher_set_flags(tfm,

				  crypto_cipher_get_flags(tctx->blockcipher) &

				  CRYPTO_TFM_RES_MASK);

	if (err)

		goto out;

	keyp += BLOCKCIPHER_KEY_SIZE;
@@ -182,8 +176,6 @@ static int adiantum_setkey(struct crypto_skcipher *tfm, const u8 *key, 
	crypto_shash_set_flags(tctx->hash, crypto_skcipher_get_flags(tfm) &

					   CRYPTO_TFM_REQ_MASK);

	err = crypto_shash_setkey(tctx->hash, keyp, NHPOLY1305_KEY_SIZE);

	crypto_skcipher_set_flags(tfm, crypto_shash_get_flags(tctx->hash) &

				       CRYPTO_TFM_RES_MASK);

	keyp += NHPOLY1305_KEY_SIZE;

	WARN_ON(keyp != &data->derived_keys[ARRAY_SIZE(data->derived_keys)]);

out:

crypto/authenc.c

+0 −6
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, 
	crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc) &

				    CRYPTO_TFM_REQ_MASK);

	err = crypto_ahash_setkey(auth, keys.authkey, keys.authkeylen);

	crypto_aead_set_flags(authenc, crypto_ahash_get_flags(auth) &

				       CRYPTO_TFM_RES_MASK);



	if (err)

		goto out;
@@ -107,9 +104,6 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, 
	crypto_skcipher_set_flags(enc, crypto_aead_get_flags(authenc) &

				       CRYPTO_TFM_REQ_MASK);

	err = crypto_skcipher_setkey(enc, keys.enckey, keys.enckeylen);

	crypto_aead_set_flags(authenc, crypto_skcipher_get_flags(enc) &

				       CRYPTO_TFM_RES_MASK);



out:

	memzero_explicit(&keys, sizeof(keys));

	return err;