From patchwork Fri Jun 28 09:35:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168038 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454699ilk; Fri, 28 Jun 2019 02:36:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzsMgNuKbOhtOo5nE2DxX7TVESgJjT2Zf5DvSGL7WA0qoCaICKYuF92XlPnG2Q+EzSIj0kl X-Received: by 2002:a17:902:4:: with SMTP id 4mr1607577pla.287.1561714561895; Fri, 28 Jun 2019 02:36:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714561; cv=none; d=google.com; s=arc-20160816; b=eo0VhkJyAuO70F+wHosNRXDpZlKEODMoMLggwSfDEbHLUTjK7mCPsTYMGB+OwnFKx/ f1mfVG1vUf5PguIpcqlRZplRhHBn0gqTiDF4L51ZukZ5X8D16TagPzXsZU2nUa3h0dls mYVsF9Mam3OffuSFN9Te4pcQKKR5MmnRhnY8rUYyc2aTL6RvVuVR7B9Fnd2Fzs1n5Goi YJCQUM5tsZ+AA95PDRB6//BxDmtYV7jOq/aqUnT/j+dlzilEkKApGCC6DgM1O1ztlySE k+SvMI3pVvOqrslI7cyaXIB5hr7wGhXQy/N3v6EbkPmL3WpMD75IED3CqTRWjenv0rUn 2KTA== 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=vSQKZ3bzm1shSM3hwnkO5Kh0qutNPZoosKVcwtVkCKc=; b=CUE+QBS8xYjh3cf+4eYZKU+m8G/MN4oH1Ieg0ARvlaZ0+7sjNV3rlGYvjMWWNkIz2+ HKccQgp4HO9O8161WI+syaCc4VRWoGPkSLaleI2+PD8oLNb6c808h1yJd18C2KyWz4Jg KxesFFg8ucM9l2RBfJc4+gSISNrtHeWp/L8GbHiJn7ICAZBcUKl0eiSYp1rwgpqUJEbi eBdvjlh7C4U6tmvUxRO5Z6sZjbCzKLHYw2codqJnJdg2vaELG/DuWD3+vI5JM4+qCbpX yTohprL9pvbF4WctOhF/QAnu0NBF+1Ob2cWzI+2/NS/+6OWHSNzq9+4COoxOgnbcjfIg 1S5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dwApxGdI; 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.01; Fri, 28 Jun 2019 02:36:01 -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=dwApxGdI; 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 S1726731AbfF1JgA (ORCPT + 3 others); Fri, 28 Jun 2019 05:36:00 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35036 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726702AbfF1JgA (ORCPT ); Fri, 28 Jun 2019 05:36:00 -0400 Received: by mail-wr1-f68.google.com with SMTP id f15so5565180wrp.2 for ; Fri, 28 Jun 2019 02:35:58 -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=vSQKZ3bzm1shSM3hwnkO5Kh0qutNPZoosKVcwtVkCKc=; b=dwApxGdIMeRWCQPnK9QMIwCVpxtwWcg/gyJWUQD24kAEAMRDsc23dI2iINEl5dD3nD qV2ROnFp5P+K1P5ns8vVwI3D5zTa2QWBTNipvG0HI4jVKVY6G6GVAzx0NvOLNR8TcJ/S bExIGNBzUa4Zd8jiHvC0MHrcpF5JahsYnW9nwNP2Lyx1iN/EsSTxPJ3sQKRm9hPX8/YK YwqChbnrOEDPrFBRiCl4vlp4Z0IQECc9KGMrZLQa2CUR1eMxkpRRtmCxz+wtYyCp8tp6 yUJnSDCF24fT7Xot4Afjqv/FmW3f3//bsaXIcxLzUZMmTTHzAHYtUkXXwTSBuql40dvk gEsQ== 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=vSQKZ3bzm1shSM3hwnkO5Kh0qutNPZoosKVcwtVkCKc=; b=b0DRPZ9Jiow/lhYgNI+EpdSd3p677q15dpbu+jVpSl4aQiLsvqVHIwVKViCk99WWOX 6/cTb7GG5PSr576SDsyw1So5+JqRCdXs5wu/0241jlXNJfBExPpnb+IBsxuvtxWlhJlH zTCpVvzaI4/hBpR5OaZmNT7VHbxs3BcDrZddweEAbOmDjxiVrLuBYiThcMIeto4HDj00 grgMv168K5HMyBR3vttz9uG4wzj5QyySX3/Uul509v5Swt+fUgb1rxwoTIxwcZO20CYS 4DqD2c9efwLjMFBvH/K3Hjhp9OqA1I5L+6gMNi64OQ02zRbZmqOXVCmk8KGBqC4IOqMq GIJg== X-Gm-Message-State: APjAAAWuzWdPsY7bM680PiS/BzPQSzq5aK3/TJT6KEI9RKCg0mchNHuF nsaOp6ZeF0qZrq4n3ucm3Hm2DQhKnOMzEQ== X-Received: by 2002:adf:ec12:: with SMTP id x18mr7038797wrn.145.1561714557693; Fri, 28 Jun 2019 02:35:57 -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.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:57 -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 18/30] crypto: picoxcell/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:17 +0200 Message-Id: <20190628093529.12281-19-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/picoxcell_crypto.c | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index 05b89e703903..842b413cbe60 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -751,14 +751,11 @@ static int spacc_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key, { struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); struct spacc_ablk_ctx *ctx = crypto_tfm_ctx(tfm); - u32 tmp[DES_EXPKEY_WORDS]; + int err; - if (unlikely(!des_ekey(tmp, key)) && - (crypto_ablkcipher_get_flags(cipher) & - CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { - tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; - return -EINVAL; - } + err = crypto_des_verify_key(tfm, key); + if (err) + return err; memcpy(ctx->key, key, len); ctx->key_len = len; @@ -774,15 +771,11 @@ static int spacc_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int len) { struct spacc_ablk_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; - } memcpy(ctx->key, key, len); ctx->key_len = len;