From patchwork Thu Jun 27 12:02:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167946 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2249653ilk; Thu, 27 Jun 2019 05:03:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzo2B2nSje1tLcjbSEGREQs/o1HCezUNTDd8wJZFOrZlGOiB2D6/qrcVeEjQV7lbYzhu7OG X-Received: by 2002:a63:fd0d:: with SMTP id d13mr3562419pgh.423.1561637026297; Thu, 27 Jun 2019 05:03:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561637026; cv=none; d=google.com; s=arc-20160816; b=gEeAzJxmYiDj0xq8YdlxFnehj9lK6bT1zgdIUa6xIzppoWiAOAszkS8ygyI3vnCCB/ YqpQuCZKxYFvmRlQEpD41scFfJdDvBue5PkrAnPay716XKbV7+GD8GFSUkkwqbqkK9xa Lt9mpPIW9WzPfRG2uvRwWjASYkkza/Ggb9er8nUTlVBmbL3O8k+N9DguvaOPSJNqQttH gLxKEuE5SKH2pP5Zn36sCPJD5aYrfRac6I5PsL8GqS4tTRe+gottZfXOfz5SZHOiEDa4 qF/9erMB/as5KlG8NqBtI0INcua7aKUuplI+D1WQPtb5NEmfpJrNeSKAHZixpD9f6BlV p7fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Etn4shY5XiZq8od7GrHPK2vvKa6M5pcmxZ0giOOWz20=; b=nbkImEHIoGemGZYn/JGcCSaUZszRailgm8PT5bsOdOw4MUld5wSse1Bd3o4BxV0VNg Hai0c1zi31ysPR8FIc9eynSE6JKwb4RC2Pzd22g9Nn91aeG3clRwUgSYItr+uJrY5Mx6 w47y+2foV3J6fAt4NwyN7eFw0DAEK9PrJyAap7WGJuOrmqiGbiQHdTQ6c1Erp9TZD5PZ cyhOAqBC1rKsdpEd4RZBxVHBRIOezptf/Yfcpe3OZl7UKHyp4FNXOqZbQQq2YKk70ocw fPRpcY1pgkNMe/R8xvGQN3BSET6q+BzFKhphq5zknihuW6KZQ0u2FS2Y7E247b5Jh1P0 uC4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qjTNGrzP; 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 m39si2229121plg.155.2019.06.27.05.03.46; Thu, 27 Jun 2019 05:03:46 -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=qjTNGrzP; 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 S1726748AbfF0MDp (ORCPT + 3 others); Thu, 27 Jun 2019 08:03:45 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:34048 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726801AbfF0MDo (ORCPT ); Thu, 27 Jun 2019 08:03:44 -0400 Received: by mail-wm1-f68.google.com with SMTP id w9so6904525wmd.1 for ; Thu, 27 Jun 2019 05:03:43 -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 :mime-version:content-transfer-encoding; bh=Etn4shY5XiZq8od7GrHPK2vvKa6M5pcmxZ0giOOWz20=; b=qjTNGrzPjTtuzb/QCfw+Oyux3V8GyRR95w4QWt++x527g9L9iLBtrZJoR3wWyhg1lI oMDgDn5teZTAa1GMYPfWMUx+80saTcbuYWSXc6eEnl7AOIshWY09Nnxt9lPtVjL/8eo7 Yel1T5MsZOJSLYzubqeHWQdxz/tgka5LKZ/flf7w47Sqv0PRC0vgJ7uGPnfAEG3frkg1 1WSF/M7yKp6RE4hDndlvlxeoWSHZm0S6ri01jPT2nqkd31UBy57b7IEYpQe+azo1reWG i1UTNL4JJDKaoHPMGlQRZIdajbePavAdKnznz+U5cU9FabdbFeUtyDgtqXhcHl5A3xLL JgQQ== 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:mime-version:content-transfer-encoding; bh=Etn4shY5XiZq8od7GrHPK2vvKa6M5pcmxZ0giOOWz20=; b=t8DSs0NPSKGF38ZuMpGAv+1iC0yV8xat3crhvsQTaIsX+f1b5uamasEJyxIuKp8Hv5 hCc4toUFNsKH3kKyOtAFjFAlmmsaUYv3yR6c2o+V+rlq1yaP1JRhiEd6gs5fqOWytqRK hBKa6SEXuSIYEoQPwnJSQs6FbcZ5hGwpa0Au/LCJUMy8L2rICIOI9eDrV/K/13rh5U4G tNubejSizN5bL++O6MFvTKCPLEhp7a7MVvER14D1YBB8npfdSlsgqWrTLUsGJLm3xjdV CYIOTyjsBL6Tvd19J+AgaO1ibX2B6615CbrqxrzojaD5XM6iga3VUQOcD7T3js3K08lj xpeA== X-Gm-Message-State: APjAAAVSD49lcj29tKjYoQiDWneCWwttH+MiqDhaw0Vhy8iRxq/2Nphk WbscSIsd/gSFRe41YDB7LgcEnFAcHOngwg== X-Received: by 2002:a1c:eb0a:: with SMTP id j10mr3226971wmh.1.1561637022720; Thu, 27 Jun 2019 05:03:42 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id z126sm7732431wmb.32.2019.06.27.05.03.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 05:03:42 -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 v2 15/30] crypto: cesa/des - switch to new verification routines Date: Thu, 27 Jun 2019 14:02:59 +0200 Message-Id: <20190627120314.7197-16-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627120314.7197-1-ard.biesheuvel@linaro.org> References: <20190627120314.7197-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 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/marvell/cipher.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c index 2fd936b19c6d..718b51675638 100644 --- a/drivers/crypto/marvell/cipher.c +++ b/drivers/crypto/marvell/cipher.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "cesa.h" @@ -277,19 +277,11 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key, { struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher); struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm); - u32 tmp[DES_EXPKEY_WORDS]; - int ret; - - if (len != DES_KEY_SIZE) { - crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -EINVAL; - } + int err; - ret = des_ekey(tmp, key); - if (!ret && (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { - tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; - return -EINVAL; - } + err = crypto_des_verify_key(tfm, key); + if (unlikely(err)) + return err; memcpy(ctx->key, key, DES_KEY_SIZE); @@ -302,7 +294,7 @@ static int mv_cesa_des3_ede_setkey(struct crypto_skcipher *cipher, struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher); int err; - err = des3_verify_key(cipher, key); + err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(cipher), key); if (unlikely(err)) return err;