From patchwork Mon Aug 5 17:00:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 170587 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4537747ile; Mon, 5 Aug 2019 10:01:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQj78LjljSyAzq0lGQy7mUG817GQbxienk4Qjpp0C79ZoUqTadDFl+pM1LwV47hAmkgdo5 X-Received: by 2002:a17:90a:9301:: with SMTP id p1mr19005756pjo.22.1565024504233; Mon, 05 Aug 2019 10:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565024504; cv=none; d=google.com; s=arc-20160816; b=Xt/u2e3Ri5396rB70DTcKzd13vcQbniotK4iz9UvAowxZP02HmawtKva6XdhbflVvd Wn4rzd5fJipQSZ655xjH0HhT1KudECY3tjYYV9/y4Mv7tV4EFOsUGpy7ZsZzE97Sqy3y zngPqnNgC8KZHYtWcL00zsuIldyQLqTDCsiepIt1DgQC7B4iWy9A2O8cKanV3NxzMb1r latRG5zmzixZCmjJ4UEi4lw2oPjkOIDexHVS0g+jsmZBvLVpkdhEX3OxXV6qa4tUKZmt xbtqBXZiiSD/S3oLmNIgYCOIIn1oFYu4NeH1FWJPt1wHIncgn+1HleVAJLoNh8jVJdv9 pwOA== 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=4lxZDOC1Y58KLeO9JczYkAO5RiRWd4BeTfNyToHmZ4o=; b=hfKxU3dFworFWcE4ReMcl/cqZqkMBZe9EJ+MAXcomam6Owu0SHjJiEzmjS9WDx9w2O vd5mfGbc4PK+m1F9jvBDAolphSCpMa7os6GvjdEd/NxJKEAH2/Cf2d16RrSRlyWZCBbP nU0Uozz8Vqs/gtvmPjEq1iA6nwkOnynBqH/LuIYzUzjtIF7imQPajiPwltQFKofAnKA1 /X6ahojj0Bge3EdaLm0CWnV2TDD8N+Knu/kQsvXFxePqpsDPMnNEtERh5IC3z7zq35D1 ppqKnClOBqjqpsru4PqgiVpcKgvFvu09LRXcaQaZZFK2f+Gb7LgEvChEKuP3dPST7Y1D 3YVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ZO6ze/ol"; 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 b61si41087117plb.401.2019.08.05.10.01.44; Mon, 05 Aug 2019 10:01:44 -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="ZO6ze/ol"; 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 S1729483AbfHERBn (ORCPT + 3 others); Mon, 5 Aug 2019 13:01:43 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38249 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728871AbfHERBn (ORCPT ); Mon, 5 Aug 2019 13:01:43 -0400 Received: by mail-wm1-f66.google.com with SMTP id s15so52370665wmj.3 for ; Mon, 05 Aug 2019 10:01:42 -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=4lxZDOC1Y58KLeO9JczYkAO5RiRWd4BeTfNyToHmZ4o=; b=ZO6ze/ol/eQ0vv70bom72+XEPx6eeRUUYDjetdlgBhcUNj0oe85LMq/bpFH2wyRdDJ hz1z26e/Yo8TyS2iVqtJAaEPeXEYFhFHSKI0JHLGLJNnNIwgOu/vyiwLTMDo77/lctFF j7TaDAghiPZx/MKL4Ro/odSUY9CIewLAu+RtPVr2qLsyadHkbHqNF13w8GMvS8HoPe0p FmMWa2vIIKolwK5ywRHDxOwQinvjz6vAqKfAewIm73AEOzAFju00eqBPrl5WvpnxcGMj buc1QCY+OY8fql43nbXOALWRQqt2Pfkq96qGGas1bV7ip+ZkwG+lLrUcp+jhMLbaGKQo k6ew== 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=4lxZDOC1Y58KLeO9JczYkAO5RiRWd4BeTfNyToHmZ4o=; b=EjtTqXS+0qQG7yHFKuRLFf7MQbjHlKnxWmIYygkv4dwNZo6TDZKi2VvtsDum8HdB9S vJOX+38RDQIwQfktll1BSNFUAWTj8rhgOWnEe6p8Gt9SB0NNf+UO+fcw0hae3RZCqNaz CSUZkobnLF+kbs4QB0f3YKeQa3OBeNNcX5LcKsWeYfskesZSq3AOteK1YhVKsInJiUP3 S9HDbaVvwKOSsh8mjpPA2EatzgUoD6y3cyEU+GBZfScpAH4Sz7S95uDr1AUveJp93w/i WCDsjkO6MPT1LjnmdxRmQSPDPJuvd5d8PkBscjiLEmW7TCRoQsdJe4eJVeLgQ8vvol1e keiA== X-Gm-Message-State: APjAAAVOpRLuvBBf06zMIjcVaaOJTHGQVlBcbAUbN8RZFdEosj9eYYt7 9hBokuzC887AvphABUnrAL1+aRliFERl1Q== X-Received: by 2002:a1c:7c08:: with SMTP id x8mr19555680wmc.19.1565024501264; Mon, 05 Aug 2019 10:01:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:a407:da00:582f:8334:9cd9:7241]) by smtp.gmail.com with ESMTPSA id j9sm95669383wrn.81.2019.08.05.10.01.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 10:01:40 -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 v4 11/30] crypto: hifn/des - switch to new verification routines Date: Mon, 5 Aug 2019 20:00:18 +0300 Message-Id: <20190805170037.31330-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org> References: <20190805170037.31330-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/hifn_795x.c | 29 +++++--------------- 1 file changed, 7 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 5c3f02e4aece..7cb750c34e37 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c @@ -21,7 +21,7 @@ #include #include -#include +#include static char hifn_pll_ref[sizeof("extNNN")] = "ext"; module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444); @@ -1942,22 +1942,11 @@ static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key, struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); struct hifn_context *ctx = crypto_tfm_ctx(tfm); struct hifn_device *dev = ctx->dev; + int err; - if (len > HIFN_MAX_CRYPT_KEY_LENGTH) { - crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -1; - } - - if (len == HIFN_DES_KEY_LENGTH) { - u32 tmp[DES_EXPKEY_WORDS]; - int ret = des_ekey(tmp, key); - - if (unlikely(ret == 0) && - (tfm->crt_flags & 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; dev->flags &= ~HIFN_FLAG_OLD_KEY; @@ -1972,15 +1961,11 @@ static int hifn_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key, { struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher); struct hifn_device *dev = ctx->dev; - 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; - } dev->flags &= ~HIFN_FLAG_OLD_KEY;