Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp2985055ybh; Mon, 5 Aug 2019 10:02:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZeTZ+C2TH3gbZhpcM343omiUm+HFTgz5RCeAeb+Yxm38OE1894iTV5C1ODkChxmA+3Njd X-Received: by 2002:a17:902:1125:: with SMTP id d34mr145445769pla.40.1565024565437; Mon, 05 Aug 2019 10:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565024565; cv=none; d=google.com; s=arc-20160816; b=uojl/4MXGEWjdN/45LZ2WUGGIT++7uuZq3yCicXeUTg7OYSE0X1eNCuqWm9oV0Ak0s uoScCI1ViPa3/x62g+EQhwcenWlzm4Pq263a8GUG7RhiGz/iga2zCobG2tSPmirGXbnA vk8HCaW17MRmmdEOIOFaGrUhK3fWfbF50Z/goFVTn2KewcHhdDuKJUJIeNiXQNRvfyfv fgCUp31lL15k8j73qGd9hle2+R5dVCbqsETb8i1rLPChC2CgdOiXZEWzy0yO7IA9+T7q MmkCZl+j3hnuk1uNBF38DXgYv0iS2+76S+KoPnLfvd8Nc3jqcvQeoESgWQQTb8kMxm0q F82g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=VBCngyQGZmU8Cnfx0i/YpoNN6k5U5JO1wOluhtxvAhc=; b=wgx62VoXz9RgJ1o32NaSsvimyuvF2/21SLAC1KYM/IeUISkpZVYgjp9xOFt9p1+qEx rGm+WJIAvPQHJ41t3Z15UlBfKhFOvicDy1yIKCcjwel4rmYOS7VmgDPYd7VqQdeNfxgm pICNSPtEQDcVVz9QsWemeEX5SsA5cBXkrsdAP7aYisg5MLlUTOtpBJRSQhF30+kc5zIH AUrou7Ogmh9dygdCKqKxE2aPPOxUm7SsbBw55pzVFDlpCOa3uypmR7hRXBRhI6SaDOQ9 n4w+ih5CY/UdcLXVTpHM3L6jjHkoysvDa7SbnlrjMqE3EqdvQP7RBEfYfrYwUIRegjWb Ha5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OtKu8lUM; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si45680345pfn.104.2019.08.05.10.02.32; Mon, 05 Aug 2019 10:02:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OtKu8lUM; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729903AbfHERCQ (ORCPT + 99 others); Mon, 5 Aug 2019 13:02:16 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39354 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729780AbfHERCQ (ORCPT ); Mon, 5 Aug 2019 13:02:16 -0400 Received: by mail-wm1-f68.google.com with SMTP id u25so63359599wmc.4 for ; Mon, 05 Aug 2019 10:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VBCngyQGZmU8Cnfx0i/YpoNN6k5U5JO1wOluhtxvAhc=; b=OtKu8lUMGyewaxPEAnpt6pmXHYcZq4sAra7l7HBryG2SmyXXxK0f9DqyE5JPozNE0X /lmePcePlMcOusQNBFkOVcJBwG0g+cMi34XlQtU1w5NlrhYsWJPmqOyS3jX+R0sjwp3X PItKSGEfyeUKd3sUCiLDeA4859GS0gED1rhJHV4JGTCynVbnFxToEY/FSnIq9qah7cJ1 zmljdPeK7aCINXecvoLgM2zg6H/ivjYoNXmCaPW5cv+0fCtiG3vWY9YiVVVZQJOq/UIT XivZNX2vW60zl9rkqg/CGVhQkGI4rNbsacsAQ3qEMpY8GhIMzlroKPBCnN2tnkrQXZMV JkDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VBCngyQGZmU8Cnfx0i/YpoNN6k5U5JO1wOluhtxvAhc=; b=Rt/jRTu6StvFmSp597LHJJX7VBmwzQ/pxGuD+87QuMgKjDK8cw6s8FyId/Po0rZzuf szwgKOefE62UQWgMu61P40A1et1O0LtzA++rgs9Liqi/LsVt0csGMS1w6Yp11/yk/AzY QMVnrvZu5KWbyeyr54BQwRUDlOXmuf5ke8516dDFvxqsXfBmQuY4kaeNU3Dl4HIQv3jS fNH9fy9PdIfF8fZyXS8YlvmPfBQPtZHufIldf3HlmOizpyYPnrmxu7xFE0Sn6ZApACB8 c61Fep0q22SRE/m6kTrxJwrqaCDSnUH9NVY68IxOYsuw56mGXLJDc1bzvR7h7KkbQom5 0Psg== X-Gm-Message-State: APjAAAWg5WuckSTwXksSuRDqbN0/rt3G1oLUmu24VkQTXTVW4ILqNYnI G46J0ktFBGKouhBW48CU1K7WvYrx4AG64A== X-Received: by 2002:a1c:4054:: with SMTP id n81mr19961719wma.78.1565024534111; Mon, 05 Aug 2019 10:02:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:582f:8334:9cd9:7241]) by smtp.gmail.com with ESMTPSA id j9sm95669383wrn.81.2019.08.05.10.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 10:02:13 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, horia.geanta@nxp.com, Ard Biesheuvel Subject: [PATCH v4 23/30] crypto: talitos/des - switch to new verification routines Date: Mon, 5 Aug 2019 20:00:30 +0300 Message-Id: <20190805170037.31330-24-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org> References: <20190805170037.31330-1-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Signed-off-by: Ard Biesheuvel --- drivers/crypto/talitos.c | 34 ++++---------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index c9d686a0e805..890cf52007f2 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -939,12 +939,9 @@ static int aead_des3_setkey(struct crypto_aead *authenc, if (keys.enckeylen != DES3_EDE_KEY_SIZE) goto badkey; - flags = crypto_aead_get_flags(authenc); - err = __des3_verify_key(&flags, keys.enckey); - if (unlikely(err)) { - crypto_aead_set_flags(authenc, flags); + err = crypto_des3_ede_verify_key(crypto_aead_tfm(authenc), keys.enckey); + if (err) goto out; - } if (ctx->keylen) dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); @@ -1517,32 +1514,15 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, static int ablkcipher_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int keylen) { - u32 tmp[DES_EXPKEY_WORDS]; - - if (unlikely(crypto_ablkcipher_get_flags(cipher) & - CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) && - !des_ekey(tmp, key)) { - crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_WEAK_KEY); - return -EINVAL; - } - - return ablkcipher_setkey(cipher, key, keylen); + return crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key) ?: + ablkcipher_setkey(cipher, key, keylen); } static int ablkcipher_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int keylen) { - u32 flags; - int err; - - flags = crypto_ablkcipher_get_flags(cipher); - err = __des3_verify_key(&flags, key); - if (unlikely(err)) { - crypto_ablkcipher_set_flags(cipher, flags); - return err; - } - - return ablkcipher_setkey(cipher, key, keylen); + return crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key) ?: + ablkcipher_setkey(cipher, key, keylen); } static int ablkcipher_aes_setkey(struct crypto_ablkcipher *cipher, -- 2.17.1