From patchwork Fri Jun 28 09:35:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168040 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454752ilk; Fri, 28 Jun 2019 02:36:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjkSmt0Y1zfWKwpsQ+YHISAUsy9Z3is6o6RjYrfAvGH4XkBhwikhOEKoeL8WEZ8euX6YCm X-Received: by 2002:a63:f817:: with SMTP id n23mr8427672pgh.35.1561714565177; Fri, 28 Jun 2019 02:36:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714565; cv=none; d=google.com; s=arc-20160816; b=zgl/1sEEaLmLkBajqkMrGhXv63G3agd/bud/pt2ODesRq03Tnj4gGmDWQ51MrneD/s 6GYJ8n6hqKbhhRyp8d714Q1urJ7hEVIwjySMO1vaeu27h31fGOZkpYGmIP3T9k/1cCL2 jDNT2boTQ8H2KzzStx1DOfK8FF3xhidMyljozjLfNgJHQJt1wxF4pn1n9HqHY/6BK8jD bQSEKC05U6Nqz4Jz4DfUs13LhSeFDwNIzXCjksqaLSpgh1U1/HxWd6ciBVHjMToe7HIB xZKLN2xP871CtbCPIkbVeYXfCHHOOa9DLfBtH9/PtGnRmJ4I33n5Rl0wAaXBJwa1IXll KTiQ== 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=BBtjv0mX3l20qT+8X4zS6U3CU75NGBuRJ4htuDc2CpI=; b=h6T46RnOtAYC6XIEW+hKNr8qP83akydXyGa4mP2vqDfw5+ZsU34JE0bEpdk2GEhUrV Wo74XXU5H64Ry3c7EmcWqKnRQfa6iYyC9+L5P9Jq14XpU/LHWxlHOBbrtI2sQmxnAHKX s3WOiuIoKRf1NDaV//JbMVHvsIlnHxLOCqpFWRnMnDSzf/VGNH3lq0lS3O05gspMWALX NcKH13f4WTKuyFg4oz0CUGc0OWiF4RS1T5F/pslPRF6XRBz6fXvI7mO7eD56l3x+acPa Cc6QCY7rvYgGFykvRnhwayMlRcMANdqz4hxXmHQ5yJglQL5xXht9LlPOPbXTmMZ/AZXX AZ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UEN4T0zi; 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 x13si1637805pgh.116.2019.06.28.02.36.04; Fri, 28 Jun 2019 02:36:05 -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=UEN4T0zi; 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 S1726734AbfF1JgE (ORCPT + 3 others); Fri, 28 Jun 2019 05:36:04 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38530 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726702AbfF1JgB (ORCPT ); Fri, 28 Jun 2019 05:36:01 -0400 Received: by mail-wr1-f67.google.com with SMTP id d18so5546955wrs.5 for ; Fri, 28 Jun 2019 02:36: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=BBtjv0mX3l20qT+8X4zS6U3CU75NGBuRJ4htuDc2CpI=; b=UEN4T0ziMKU+6EBQ1exK9Y/LYpmLXGHDfemNF5GTYMVK0DIj95tqV792DMmD/Q4RrM ccYCHnkD0uN7vsl4Hl1CCTc1DG9M3dyxKcvD+oNZxjlBuApAXaw2Xc9A1FRfYVIgIwYB 4lrQgksi0s7df3SS4If/6llVVFnrjNXK203MboD/+LQWm5OacGxH63J3Bkiag1E9DF19 0CLvQ5HBjPI4M8/gGFKtrPZGys8JwYtfe1uFN72kiYKWcckjCjJ4nZEnyR2xrhi9vCOu UlE5wdd3niYvOsQxcWzGAQFbj3JoxzV8FV7qGg7TpQasGmT07GdysgR1T7U1Aknl62Pp mmRg== 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=BBtjv0mX3l20qT+8X4zS6U3CU75NGBuRJ4htuDc2CpI=; b=PLDMY9i3ONE8FhIShtKp8W8+ObGjpDbuX2uXi7t7T+w5Uv0ZxeMngxLvz1AgkeBCjn pYrbks52oE67tmV1+d9hHkq5oQRSPLYgUsUVBHJAwSuLJvoFJ4eKEZ0rXhTzpy0W2bJA NKuIpu1KVCXZdbc88yXl/NW/3mzQZhsH6QNM/tILHoA9c6PcJlzUAcH6xbMQ18PsTH4L S7wgcHuKSJbyHzeNSnIgrWt11rN8eauFotZF7VG82ls9Cz/PXoIc4XOepF961CmdCXb6 LTrjA5bPVYsa3k2tQP/d4MPd2TPHWN1fnravrj9JtopIk+2E0xlIxNDLi2NXf1SY3cGI qZPA== X-Gm-Message-State: APjAAAWaNYVcatW3VJTlENHjUrHEQgJCexmTsRhLy6kAvV4NYPrW28Tj YZoFMETZaNPxUKQjN9Vt+mGWIK5NuYGdgw== X-Received: by 2002:adf:a55b:: with SMTP id j27mr477097wrb.154.1561714560007; Fri, 28 Jun 2019 02:36:00 -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 m24sm1709910wmi.39.2019.06.28.02.35.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:59 -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 v3 20/30] crypto: rk3288/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:19 +0200 Message-Id: <20190628093529.12281-21-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190628093529.12281-1-ard.biesheuvel@linaro.org> References: <20190628093529.12281-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/rockchip/rk3288_crypto.h | 2 +- drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 21 +++++++------------- 2 files changed, 8 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h index 54ee5b3ed9db..18e2b3f29336 100644 --- a/drivers/crypto/rockchip/rk3288_crypto.h +++ b/drivers/crypto/rockchip/rk3288_crypto.h @@ -3,7 +3,7 @@ #define __RK3288_CRYPTO_H__ #include -#include +#include #include #include #include diff --git a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c index 313759521a0f..ef9f192339c7 100644 --- a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +++ b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c @@ -49,15 +49,12 @@ static int rk_aes_setkey(struct crypto_ablkcipher *cipher, static int rk_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int keylen) { - struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); - struct rk_cipher_ctx *ctx = crypto_tfm_ctx(tfm); - u32 tmp[DES_EXPKEY_WORDS]; + struct rk_cipher_ctx *ctx = crypto_ablkcipher_ctx(cipher); + int err; - if (!des_ekey(tmp, key) && - (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { - tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; - return -EINVAL; - } + err = crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key); + if (err) + return err; ctx->keylen = keylen; memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen); @@ -68,15 +65,11 @@ static int rk_tdes_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int keylen) { struct rk_cipher_ctx *ctx = crypto_ablkcipher_ctx(cipher); - 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); + err = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key); + if (err) return err; - } ctx->keylen = keylen; memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_KEY1_0, key, keylen);