From patchwork Sat Jun 22 00:30:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167440 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1376712ilk; Fri, 21 Jun 2019 17:32:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMODQkgnm3S0FmaZ8FRkQo1CVD2LdAN/0sZE+ZI0hUJVZBpaCX8Zbov+qmhvpUlAcuUH+I X-Received: by 2002:a17:90a:9281:: with SMTP id n1mr9724838pjo.25.1561163523423; Fri, 21 Jun 2019 17:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561163523; cv=none; d=google.com; s=arc-20160816; b=Ld4IOGcE/iUl4JMrEYwyEnGb2mRCQ4hNkWGq6INw2aDHNNXss2EE4oblYdEFiyYgCf m3JARootqJ5wXW/oL56xj7jrP4aeCX1OVorNG3cTpKcL1C5WD3OFkWhkEnyc5bRC2IYa 5t3tsasbPR0W+bnB24EwPg7DB5cN0sMWHfHlNujxSCuQd37sLnSDsh+uhGRU7Waj6KqW xNvAmbCtTD4c4H97G3z1N9JUos8r+cqjhKVLxd2G2CPJ57CIPVP81QR+SPHF3OlVpU7C kEF4KfZyDNrpFVElzlBmZfbQqyCeE8mTEkHMSPK5CmA/nP5E6FM7yp64QSMXD+tskHmY 070A== 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=7KbUq/Neoi/+vA9jXPmf0VHExg0kIN5TmhcZN+HEmk4=; b=sgmK8QcY6xvb1AuHRR04y6ZQAVpeVEeIqQNTjHEaeCVcGoAzPqSDaGTkZNbTi+Epoe Lqve46JZRXYxIy0YPWMAzZsvJYWeS6CPKrXmEC9+gcq3nzg2j+ddZbW1PNBXqFAhjA+c wwmgmhWsDSsD5TnAA6dMI7etbdvvfYhcd5XUC8FdzZxqmyomCioJvuqNnHeCp2bxomhM NuO+mtlor5/frwok7kSrIs8hvo9eUZzsPbyByIb/rLprlKoorbbHWeOcrWj8AGNGHeKX 2nbJgyU/RuMTjqeCNhQOfFAsctUOWm/Dof8M6u/5k5sBtOLOKgfsh5ADaVMCs63b6oCc wbhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z0Qg4wX3; 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 v10si4096271plg.320.2019.06.21.17.32.03; Fri, 21 Jun 2019 17:32:03 -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=z0Qg4wX3; 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 S1726196AbfFVAcC (ORCPT + 3 others); Fri, 21 Jun 2019 20:32:02 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45172 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726049AbfFVAcC (ORCPT ); Fri, 21 Jun 2019 20:32:02 -0400 Received: by mail-wr1-f65.google.com with SMTP id f9so8073460wre.12 for ; Fri, 21 Jun 2019 17:32:00 -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=7KbUq/Neoi/+vA9jXPmf0VHExg0kIN5TmhcZN+HEmk4=; b=z0Qg4wX3eLbrweXds6GqhNJCh00BrwySg4SULPG3XMzVQsHlbojj3i5h8sG4s4ZZFh c9CTi0f75YLltwOAoHinKCvAQqgQmy2Xr/+CcGIhu05d7UQUo6b7i6yc6vf4Ryz/Hf1p iIiC7EvxF51YYRGC3YA9YvISDo8M97b5xf2Jjr3KOw4caOHMxn4Oj+FY8eXMa1AS6qTh mGDTVG2QU5uXWXrhh9VKn1FEJ4WfLnGG9+YkYtf9Si6d7k6qwOtJZOdTQXOMZ+HuOfeC 55rNdsc/ZevGbW+aQXICDcLw8IcmAUY3tHfo+9Mtf3ByBN1ybdxT42PLZ9RZF4VmMoRp sfhg== 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=7KbUq/Neoi/+vA9jXPmf0VHExg0kIN5TmhcZN+HEmk4=; b=CrUDa+FJXJxIJBrlJJUCSZUH1jElIdy8jOgYLP0aTTHzCafHQI6s2BscovTRPJSgwq 5u1BuMqLJMyk7t5v5udS844M972a1WBsaDY/6Pf4s+FV2Y256t+Kxe4C6Ac8b5OsI+ei z5RlkDXVntrfxq9CMfziOoKXx4CZlLkRI8P3A2ndarBpeAaGQrmA+ZBhpQc8fKyvCgW8 QHSDcJcwm6C6IkNGRlLBwlOK48UiJDZNUFin71vFmP6f4tpyb5iTnbfD6zVh1Swze5HT OacQeNSRgvSsvL0ZECssxN6CrbR2NEqGkf9K5O4UCtTAuv/G4uGsaBy4O/BW27JRpe0A C9LA== X-Gm-Message-State: APjAAAUEY7oX2fCm1s2jEmkFm7+CTrkbvFgtpUOpi8EeP6Oxct+xMY+Z 9iPbaVzPkACCv97WzFQ/953e8jiv0ghYlnDl X-Received: by 2002:a5d:488b:: with SMTP id g11mr22072217wrq.72.1561163519950; Fri, 21 Jun 2019 17:31:59 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:99d4:1ff0:ed6:dfbb]) by smtp.gmail.com with ESMTPSA id v18sm4792019wrd.51.2019.06.21.17.31.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jun 2019 17:31:59 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@google.com, Ard Biesheuvel Subject: [RFC PATCH 15/30] crypto: cesa/des - switch to new verification routines Date: Sat, 22 Jun 2019 02:30:57 +0200 Message-Id: <20190622003112.31033-16-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190622003112.31033-1-ard.biesheuvel@linaro.org> References: <20190622003112.31033-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..68d26a573f71 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, len); + 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, len); if (unlikely(err)) return err;