From patchwork Thu Aug 15 09:00:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 171408 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1918036ily; Thu, 15 Aug 2019 02:01:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEscU2acJ4aX9w6cvsJwOkyELb5Rw0FM4pIQXUUT31ASjhhxNgbp/8fYZGzyeSXq2p9t9e X-Received: by 2002:a63:b11:: with SMTP id 17mr2610375pgl.283.1565859702076; Thu, 15 Aug 2019 02:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565859702; cv=none; d=google.com; s=arc-20160816; b=mFy4DzPz8ppbjDbpRn+R+O0bORz2/hmGytxT1/Mf5K90xFXSokWAxryP7H8gdOw+cW GeJxIP5KjtLfva0qelf6DMmTQ8tuNe9jRV38Prisk79YrRJp4tYDgafvbgzxA3g/kbdS oQ3BsWSGxvz11p62iqBByb8U1T2Dz6/hTAlDJuIVVEsW6K7onezc0OtS6A786d0blsEN knTCBcV4iPicvben8H8y4HKn4r/e9IRWfDo2Gqkn5dvkZEeIpshMdKi6jWvpkzwWVuK1 fr7T544KP5GPNROX0eeLQ82y884rsTTCJpLQTqYNizf3gpyma8YBapRfuZDP0bfxrlfQ n+Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=R/dzAswTxDJO+r8Mbwq2UP3hHo6TATLahJ6svsPcZRM=; b=s2/1xKiQRODKfWnfFdpg0/gRqjs/ElEm/YVgpJV9y4GAdrMCz0sFQAK+JicvkHVloP LLGo08RLzVdg+A9fj67KfGA1qm4QZdvlVxfIFZkgauOookDuls3tL/AYfXojzzMlLvCC wJOwBErH0MMdHp664cb4EIgF0FMwMfWAzU/3BAQjQSrt1I6PtHSRr1icI10ujveMMcaP ya3PYgh0ZZqxVOOjS0GDB5t7PcTFHLloJodgfS/GgpYzxSmaoRCEuMKDC7V+JQvZ/bMQ 2pBCHQU23mzKltzpvew+PSxz6nOkip3VcKU50fZRzSufYZL16QIPNLbB3uYco0vMhzo9 O6DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f4UvRqf4; 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 g5si1559088plt.271.2019.08.15.02.01.41; Thu, 15 Aug 2019 02:01: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=f4UvRqf4; 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 S1730786AbfHOJBl (ORCPT + 3 others); Thu, 15 Aug 2019 05:01:41 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35678 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730760AbfHOJBk (ORCPT ); Thu, 15 Aug 2019 05:01:40 -0400 Received: by mail-wm1-f66.google.com with SMTP id l2so684297wmg.0 for ; Thu, 15 Aug 2019 02:01:39 -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; bh=R/dzAswTxDJO+r8Mbwq2UP3hHo6TATLahJ6svsPcZRM=; b=f4UvRqf4+mjlADq2VxXANUTyDi5GrfIcG7c4f+rAhM7Dr1CUb2up6E7xokErP3ybxz BKPTTshAW5JM4FncbNS97X4IBsJo1CTscysjrswleBA50xJt0zidkf6spTf0RXZ1vUbU 5U9zji5FZA2OUksccM0PpcNEne4c2NxQ+W88yoJpBTF0eyFCz4Dt0LpGvrf6rr8dYQUB XFnWjUb8cPX0jtvsrRECXyfRbOG7Dk3n/ywI9aT56AyQzOabK5Il49S1OzNF52qLbCeT 98wsgUxpcoemlvkJVT6qos8flcMQWeOtboWR/PfSXJk3ZBYv8dwo3v6ow906t8v9HWMe MgKg== 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; bh=R/dzAswTxDJO+r8Mbwq2UP3hHo6TATLahJ6svsPcZRM=; b=NW09pFjqLCpSjV6lzLKUSEuVL7fG3KErHvasnT+O4IownAB637hqUO8HpIvs+RLEYt LNK+tvPRvWt0PeWNSKhfJ0J1k3HeZdR7RQIThkaW9AsAgvw0cEEMvkS0TtiXro3KAUyn sTwM/8O7ALgcJHdHj35k3t+jfLt3FchzsmnNb+jPVoG5qiIwkmzTcb8MD7dCv47EUH3h Rm4I95WVuURhBWUyEZO9n6n5phkBA/hkwGXdevab0TEKHO97wSu87US9Ju8lYd36gtX/ vKbaVvpi10I6XI6yzRqCrdWkUxOyzEnUAGwnl2eyNKZOwoCzjebl72nJxxxBEp5ZGNTu NwuA== X-Gm-Message-State: APjAAAUWf7SoknoAm+EMLZ5N6REuHmtb/3p/wKS+VWkHMF90u9mUBBBv mIig/C5edLAseyp2t/ezjYnXCnSNXzmrgdsf X-Received: by 2002:a1c:2ec6:: with SMTP id u189mr1654567wmu.67.1565859698755; Thu, 15 Aug 2019 02:01:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:f1b5:e68c:5f7f:79e7]) by smtp.gmail.com with ESMTPSA id x20sm3857533wrg.10.2019.08.15.02.01.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Aug 2019 02:01:38 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH v5 08/30] crypto: nitrox/des - switch to new verification routines Date: Thu, 15 Aug 2019 12:00:50 +0300 Message-Id: <20190815090112.9377-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190815090112.9377-1-ard.biesheuvel@linaro.org> References: <20190815090112.9377-1-ard.biesheuvel@linaro.org> 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.17.1 diff --git a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c index 7e4a5e69085e..3cdce1f0f257 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 verify_skcipher_des3_key(cipher, key) ?: nitrox_skcipher_setkey(cipher, 0, key, keylen); }