| Message ID | 20190627120314.7197-9-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2249546ilk; Thu, 27 Jun 2019 05:03:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEAp4Pq/QipH7Ifv03a0aw3yDnvEWJYoXGRkZFU4BxnLl0x8QEUTBOF5LaAIRahOKZ1NYn X-Received: by 2002:a65:5b43:: with SMTP id y3mr3482093pgr.346.1561637022215; Thu, 27 Jun 2019 05:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561637022; cv=none; d=google.com; s=arc-20160816; b=rATwM1DR5NYGGotK2GOl+/vAf+9nIC9lfUKYNoTmSInsti44iHZScQLN499UPTBwSM VqSIEeEzO8WlSu2Rd8Vm3dTBWTDtLqU/H51TTJcjs2jJ08cy5bBAAlP3TqtTkQ2gU6ld OC/IX44f53xugKA/5e1YN1rW/oM7+5lHwdbpAfxCdaJUMtv2otltruvLrNf3BcgF2TYm 9IjLwK8qUIWQdpFD6bP7/UHStu4bWIRsnh5k32au6WjDe58ORVyk7n0YJKXjvJ65DjcS swOZmop8RuEeKlLytgEjWNKk9HuIsdD4NU2fdaxzbHex+vtwnp0VBifh+j9UD2t0uWhg FQhA== 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=nRSkthjePIj7g4MPUvkNKe1xlTbjlaOSbMbpn6GWkys=; b=Cjkss09LyROouZ38ApwLBS2+pyMOvtLRIDmZgDmR02hc1MIPN5CNu3ApYxOrWQVcaX ytTn4DB9SqHfFlF9sghbpHiS/2PjhxXOexLCMWsIZX4rcjKCwyNC49bYpRylhOl1xCaN 8HTiIa3xL/O2NTUsU5nWo12ejAT8vDx6xRToKDlgOs6N4s0v+MdbeFp28U6zAVoLkhrx VuL5JUzWX3L/fzzgpoA8hD6zKswg9Ath7D87D/w1/UU5hMtiwwVYL3IE9WcCghyUMOMa C1M2u965mwAJgWNdnIWvlXJX5QDhuEOqB5CUs2HBsbTiAyomiWo8fPxl/cevC71jAhW3 pvYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eUw//aDf"; 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: <linux-crypto-owner@vger.kernel.org> 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.41; Thu, 27 Jun 2019 05:03:42 -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="eUw//aDf"; 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 S1726754AbfF0MDl (ORCPT <rfc822;sumit.garg@linaro.org> + 3 others); Thu, 27 Jun 2019 08:03:41 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:33228 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726711AbfF0MDh (ORCPT <rfc822;linux-crypto@vger.kernel.org>); Thu, 27 Jun 2019 08:03:37 -0400 Received: by mail-wm1-f65.google.com with SMTP id h19so6920241wme.0 for <linux-crypto@vger.kernel.org>; Thu, 27 Jun 2019 05:03:36 -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=nRSkthjePIj7g4MPUvkNKe1xlTbjlaOSbMbpn6GWkys=; b=eUw//aDfanezv6Mu7JNEFlS8yfPy9YrpfjEmEwHF2u84mezCx8cXuN9i/Cw1//+mK6 y09QMp0fMIGyeY2yNsc1Ruy/CsutxsDPbv0SHRkKHb2KGiZq6UktbqjsS0VJv658sukX QcmeaLC8qKDLXhwgMEY48CDaVHxMxmDOSLxCLNzrOoFLRITvdY2j0X/AyUQFny2QaEux CKz+qOfodRGRYCePYbappm+sYCxHHZscra4bPum8wjrlR+tmI/co3Mst2cA5BQH4IFSi iE/DUkTGCPcNGihUK3i/aRTJ6g/p6dxuAOOy6G/of28Pq9EMPKq9FafobPx64NPwueA5 Rv8Q== 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=nRSkthjePIj7g4MPUvkNKe1xlTbjlaOSbMbpn6GWkys=; b=RLO2z2tFslOzzBVIVAm7u54OwNMvU13qU+3wm+MIThhI1FaV6vgPg9XVKRIm7+M0x3 Bqe3gENw/dtsnJw5ePRXZn9YYdpKX1uwku+gjCKVhwFi78ba2L37kfik/WEAWpFlGU4x vuIj5v1ke+bMVxvxDVSWLyHNUA36H0RxTn+xEah5OUEEte/KNadMc8bZXwNgxuiNdWra CRp5OhPJTUBDMgg4gQMKDSo3RBxMcoicik81g2EhqR6EGk9/6+53g3ypW3WPWEIm65Da A8KAJdQJOJCsGehAeGD/gTI+owUvkN8jF5+Usn3ZaoKnQiLdtIlvb6ZZ+k/sr7ebN854 HrMg== X-Gm-Message-State: APjAAAWyhPwFPtxQswoDqa1Ndd+L4YqlDR2tC/s9PATjJZhJDiFjXBvx xaudeZlAyrPMZoKjiKAmFIQErZdlQW6Kng== X-Received: by 2002:a1c:e90f:: with SMTP id q15mr3161873wmc.89.1561637015092; Thu, 27 Jun 2019 05:03:35 -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.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 05:03:34 -0700 (PDT) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, horia.geanta@nxp.com, Ard Biesheuvel <ard.biesheuvel@linaro.org> Subject: [PATCH v2 08/30] crypto: nitrox/des - switch to new verification routines Date: Thu, 27 Jun 2019 14:02:52 +0200 Message-Id: <20190627120314.7197-9-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 Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: <linux-crypto.vger.kernel.org> X-Mailing-List: linux-crypto@vger.kernel.org |
| Series |
crypto: DES/3DES cleanup
|
expand
|
diff --git a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c index 7e4a5e69085e..ab8ac05f00a1 100644 --- a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c +++ b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c @@ -7,7 +7,7 @@ #include <crypto/aes.h> #include <crypto/skcipher.h> #include <crypto/ctr.h> -#include <crypto/des.h> +#include <crypto/internal/des.h> #include <crypto/xts.h> #include "nitrox_dev.h" @@ -257,8 +257,13 @@ 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)) ?: - nitrox_skcipher_setkey(cipher, 0, key, keylen); + int err; + + err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(cipher), key); + if (unlikely(err)) + return err; + + return nitrox_skcipher_setkey(cipher, 0, key, keylen); } static int nitrox_3des_encrypt(struct skcipher_request *skreq)
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.20.1