From patchwork Fri Jun 28 09:35:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168030 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454535ilk; Fri, 28 Jun 2019 02:35:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuX3LoNFQA7sBzkkdM0xXV1Xe0NaapapPplY6v6kzkhZc3QVxV2uqnvczGw2StbHde8r5B X-Received: by 2002:a63:c34c:: with SMTP id e12mr8106938pgd.195.1561714551469; Fri, 28 Jun 2019 02:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714551; cv=none; d=google.com; s=arc-20160816; b=f3v7L+WlRPdFkSt6xHBVP4aEYwL10BUfKdbF93P8f/qLuPc2TyNAc5J5AJfRXdLI66 Hr+0oDLnn7eg3nHF5WgZl5Wy4g5Ii4+31cZBcLlFBJixmewvUL+VOnMDGfpEYYuq/Pva Q9KLOXhX7JMF3ObB1o4sg3KD7lyKmHpIaB1S2SSxHdxjiDaQGEg9ak9Mp5A2j8VDqiPU plV09mWzA6NvvL/12TGVhG309KIKuvpGO5ieUsyNMBb4jtuAiLcKMfuj4qm3dMQa0ErK Hn7YmtGT24z6MOnlpozUCGycg71zG8afx2rpWopm/0WkDw7SUSyIP2CYlmFTFWfwIJDC IOHg== 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=V8kUdKzOHm3U3Q+L+CiRSbO6vCtGHpWxywiKx8gNh1M=; b=UkYUDhi+TCl+NTae4hGlVxXEOZtBG+Rd+NqUBGIq8BNnnvJ707LU3kcpes49Zxn+yz +rzoGw3KQ0ZAjWYhmyE/pS2ZSqeWEU0nzyvA7oosr5eRgpc4/09v4H0PwirD1NLAtpMW F2U6mkMXYPMOvifxFdvq5iU2OtuuwRA4SiTorczvmMczxWlvjRlquu4FywdQlCRSiS1S YwO67AzIydV7bT+awPFp+hQ9ACOE1vRYmOOJlgvpMalvinQycD/5qNkQ1WZGRDWrBgOI zCdgJ0YwY6dYIr0EQDPfQMp+GlPF1Q2le4DJHVqsyifrkin8cjb0jiUm/o2c+0DGuigh SB4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QiTQFAHx; 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.51; Fri, 28 Jun 2019 02:35:51 -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=QiTQFAHx; 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 S1726674AbfF1Jfu (ORCPT + 3 others); Fri, 28 Jun 2019 05:35:50 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35528 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726656AbfF1Jfu (ORCPT ); Fri, 28 Jun 2019 05:35:50 -0400 Received: by mail-wm1-f65.google.com with SMTP id c6so8334316wml.0 for ; Fri, 28 Jun 2019 02:35:49 -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=V8kUdKzOHm3U3Q+L+CiRSbO6vCtGHpWxywiKx8gNh1M=; b=QiTQFAHxcbq1Jf6P3yCPbX1D8MunbEeJw+mMRhmdbvgzRtX6LTlIuaKkZ8A2+jWFaO OeNX9UiE4C3Kn3fbw6GNUPp82yX7MQrNz69lTLFP/U/VsxDVPlxssuXBp9A9GKD+T8Bm BzI9BURPYNXp/x76dppCJiOylkilL8SnNyiu6e1fC1lhW1hXQJTPY63nVDqaT12vd/ie NJkAyHlU2wS7Tdeyz8M8cutHVkHvVHM5wvt8/9cibkKn/MDQHnbZBix1eyppC/whSgVI pdLQLjjGDW+/lIJqj5gLmtuEJYiomM0YS541upNs+jZ0XBC7TqRSMx1Kg16ekdy93O71 stEw== 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=V8kUdKzOHm3U3Q+L+CiRSbO6vCtGHpWxywiKx8gNh1M=; b=BPKGpPtqRTSHR9+kmq2sSF5jhZId/h/bOE8pXwMLikVEIcjxxFlz9OZI5yPbx6JEf1 yFsCqkFxZ8gk7w9XtbXsV5w623GVLTqVAyOXvZnRhDhr/Sd55KT9S1hsYkFVTzGA/n9z 1oHFldbIOAJXbfZnAtnFgkCGzxjZs+55Ms7ReHkM8Riu62n1ZZG8Ww2nHIDx1W0wu7QQ iLhwbWRft5Rpev5yaS7vdXIVlyRTReakRcFGO+rjBCr6mHftsxnPwPakQQQf+hvuQEbA BXQVPc8GsO9bSYVvq4uYqCJAAJBsfdtveZpUz3TDBEJiTyYKW4H25PHGWxtlaa3tul67 nctg== X-Gm-Message-State: APjAAAUZrOAvmhmivAGT+ZSr8klY0+yhry7H95ENDAFb5X9pLS7tS0D4 TRLqmLt0Hh/g/yD0MfXl30lNZQy9cnWlIQ== X-Received: by 2002:a1c:c706:: with SMTP id x6mr6466087wmf.162.1561714548326; Fri, 28 Jun 2019 02:35:48 -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.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:47 -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 09/30] crypto: ccp/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:08 +0200 Message-Id: <20190628093529.12281-10-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/ccp/ccp-crypto-des3.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c index 91482ffcac59..23e6dfba2abb 100644 --- a/drivers/crypto/ccp/ccp-crypto-des3.c +++ b/drivers/crypto/ccp/ccp-crypto-des3.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "ccp-crypto.h" @@ -42,11 +42,10 @@ static int ccp_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key, struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ablkcipher_tfm(tfm)); struct ccp_crypto_ablkcipher_alg *alg = ccp_crypto_ablkcipher_alg(crypto_ablkcipher_tfm(tfm)); - u32 *flags = &tfm->base.crt_flags; int err; - err = __des3_verify_key(flags, key); - if (unlikely(err)) + err = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(tfm), key); + if (err) return err; /* It's not clear that there is any support for a keysize of 112.