From patchwork Fri Jun 28 09:35:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168029 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454515ilk; Fri, 28 Jun 2019 02:35:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHd2hXsOJ5yekyVc3dSpSMUcMLtl4kq54exJRpqrWqPVhQ2KvUbfCUx3uQ2rYKSkWOGmmu X-Received: by 2002:a17:90a:35e5:: with SMTP id r92mr12151132pjb.34.1561714550249; Fri, 28 Jun 2019 02:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714550; cv=none; d=google.com; s=arc-20160816; b=Ejk95xVTMtCZGB6hNBKsbcZnXpt79DoNZhl+NcNfclHl1HwLI4Ah3/PXFBy+bRNxuS w5DpjPIu8MR1JrhT81NigrhlPqS3vitS1T/9xDxNMU4/+zAAZ7lFX3RnpKI6uE7RH0fl jE7IY7ivolDigOhsyHx0A3OQPbDN+TjZ5UqfcYidhRBcGp8rmOzkEhG9n8D28MOH7IWS 1licPwQaSlGXN5QvFM+ClxsKg6EAx9HsdqxPVtL62Q5sJ/x4CfJ2l4HVwxojK35LPxvk BmegxKIqCMnlTGH6FmNg4mFxvZTz9LlwHH02nh4xDjFL9EPV/5IYpdR9UdqSC9uhmUSB GW6g== 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=mArMgkRrrTiVovX0YGM+hqVcrESzFxDSVfPYZOwfEaQ=; b=PTOCgn9ezKPeUlm5F1etAYHvvzT6IbYV5hixF6/jdKgQFxkc+U/RnytkNL9UsW3we5 sK81bskvGYWZQ/kyBQ20bqGNSHu0EDk3QGxjQFwRxHiMdl8sJj8TOeblVRArw6boasTE K+96THs8/dycRyZyWMYyiiLu8Qn1lhrR2J+pDVTXysPOLebtm2GRmn2X+k89gPkIq/ND RcYv14OfsniARZTnnjLXXL9LvcLZzYs+VYlAmLf/jFiOtfqyitPW7IvPl8neNRZtJ/Qv J8YKmGtw+6WE2xJRbrdyeMZVJOZRc8/SAw8OHcrA+F4YMpSHO4hXGDvuYQ0t2KnxnkyR WCwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j0VC/rm0"; 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 v9si1632064pgs.312.2019.06.28.02.35.50; Fri, 28 Jun 2019 02:35:50 -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="j0VC/rm0"; 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 S1726673AbfF1Jft (ORCPT + 3 others); Fri, 28 Jun 2019 05:35:49 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39537 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726632AbfF1Jft (ORCPT ); Fri, 28 Jun 2019 05:35:49 -0400 Received: by mail-wm1-f67.google.com with SMTP id z23so8312786wma.4 for ; Fri, 28 Jun 2019 02:35:48 -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=mArMgkRrrTiVovX0YGM+hqVcrESzFxDSVfPYZOwfEaQ=; b=j0VC/rm0465wbrdiRp6gSb6bwOawU+hPV6Yzs/955GHHfnnuXWaPxGz4KVX/xYMO17 czaNhguo3ZgXcDEezvwddhJieEo03feKI6Gkawcy568lktrYMB4e9dJHbJooH82vKTB8 dpUb4S0IE3MbR855h1D542DtaNDYCasGuLQiACUgoUTLqqsPM5iBjETNqkbecjmXbiPm e1Uqg4r0oWEVKozRTeRTdZ2GoAAaLJBCXPfGbbi1LMqXfrUP3RmnvL0podEJK7FEsxpm /g7iDGQnj+h7vNzlo5XOVUw5B0Odcz1ObG43sorQEu88ZYzoBJuvkw6BbzxPT9J4jffB azGA== 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=mArMgkRrrTiVovX0YGM+hqVcrESzFxDSVfPYZOwfEaQ=; b=T6E+9OaByP1Vyrrn/9GQq9gnNrEZrO7bHfhbShZkIMOJhOIQ1lIHwNXvdfM7SNreDe T7Ld9BnFJd2kCGA9bDgPQXnH3hBHI2tIKP+KEV0TaTVVBwmvKRelEgPXQA1QODBoy274 VLSMHz2h/cTfUxYh3NTpZ72+9bvsGV2dXCIlD2uC+B7sFGj/11I9tMAL1QalbD4OJXVo a0xV/50T4TDr00gfxX1TEmqSF36uj0wE4PcWS9T1gHp8+h2aCiapvhp/xmhDRHa+brSx E3sUvccvW4GvaDhyeGozA6hxnL0cVGf48X+8sZ+EYHRudpq6ll6qk5ulXpMTck9+QBcm QTdQ== X-Gm-Message-State: APjAAAV6A1s0COh70GjE0DpOuqDNRXpNCmuHnIda/uc7hpQPqHyLaepE HOwHdjPsdl7ZsoXR1S3ervuOmLWhsR0c/g== X-Received: by 2002:a05:600c:2409:: with SMTP id 9mr6244159wmp.110.1561714547090; Fri, 28 Jun 2019 02:35:47 -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.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:46 -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 08/30] crypto: nitrox/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:07 +0200 Message-Id: <20190628093529.12281-9-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/cavium/nitrox/nitrox_skcipher.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c index 7e4a5e69085e..9d3bd1b589e0 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c +++ b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "nitrox_dev.h" @@ -257,7 +257,7 @@ static int nitrox_aes_decrypt(struct skcipher_request *skreq) static int nitrox_3des_setkey(struct crypto_skcipher *cipher, const u8 *key, unsigned int keylen) { - return unlikely(des3_verify_key(cipher, key)) ?: + return crypto_des3_ede_verify_key(crypto_skcipher_tfm(cipher), key) ?: nitrox_skcipher_setkey(cipher, 0, key, keylen); }