Skip to contentSkip to conversation

crypto/des_generic: Eliminate some flags pointers.

PATCH In review George Spelvin 1 participant 1 message Feb 8, 2009 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 9/10 crypto/des_generic: Eliminate some flags pointers.

There's no need to cache a value that's used once in the typical case.

---
 crypto/des_generic.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
crypto/des_generic.c +4 -6
index baf51cf..a4f3165 100644
@@ -690,15 +690,14 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
 		      unsigned int keylen)
 {
 	struct des_ctx *dctx = crypto_tfm_ctx(tfm);
-	u32 *flags = &tfm->crt_flags;
 	u32 tmp[DES_EXPKEY_WORDS];
 	int ret;
 
 	/* Expand to tmp */
 	ret = des_ekey(tmp, key);
 
-	if (unlikely(ret == 0) && (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;
+	if (unlikely(ret == 0) && (tfm->crt_flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+		tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
 		return -EINVAL;
 	}
 
@@ -773,13 +772,12 @@ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key,
 	const u32 *K = (const u32 *)key;
 	struct des3_ede_ctx *dctx = crypto_tfm_ctx(tfm);
 	u32 *expkey = dctx->expkey;
-	u32 *flags = &tfm->crt_flags;
 
 	if (unlikely(!(((K[0] ^ K[2]) | (K[1] ^ K[3])) & 0xfefefefe) ||
 		     !(((K[2] ^ K[4]) | (K[3] ^ K[5])) & 0xfefefefe)) &&
-		     (*flags & CRYPTO_TFM_REQ_WEAK_KEY))
+		     (tfm->crt_flags & CRYPTO_TFM_REQ_WEAK_KEY))
 	{
-		*flags |= CRYPTO_TFM_RES_WEAK_KEY;
+		tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
 		return -EINVAL;
 	}
 
Signature · 1 line
1.6.0.6