From patchwork Thu Aug 15 09:00:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 171411 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1918141ily; Thu, 15 Aug 2019 02:01:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkR9Ag5i9k8CCMz01sSguBQTr2n3dmmZfnuL789F5xE7x1CuXQPJRX8Fylv5ac2Yy5srWx X-Received: by 2002:a17:902:8d91:: with SMTP id v17mr3495896plo.88.1565859707535; Thu, 15 Aug 2019 02:01:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565859707; cv=none; d=google.com; s=arc-20160816; b=MkNCo10gU5y2/0a7617HLiLN1ieFehawbjs98CvS1evQ1UKoSXWHqBLaqwtk26Peuj lsXGiaSh7mWyVCd/MGIfIMHnZLsGTABO4NJ+3OT76ohcLbsPEWgLrQuh7EuT+RVFgDmI buvjDoeCx9FvMOw/2hVmab6EgQ7yWH7B7Laf+TTr9JE1nGASVfmDOSgqS9alfwSuLLiH A8Jo7UWH97WUNp5uszricN9VJE8gOcqq+fWtW2rhR3EQ4oEmXdaxX8Kejs5R5tQs+PcW jjyuBhbe4nbOqeyGWhIQXDjtPEIPJSzOauYZdpqKux8UduZz/OcrmnCjlhBZFMagkfUZ X8Gg== 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=LHJbGYYVd9anPfjjvOncYFmF6xF/5unBiz7afWnI4fY=; b=wkRiDUYVvxjK6bH74Qd0KHDVJuUovUb1zZA6IzkSKXjjecuylpzRPEn7pZ9h/+8lMy B9irwlTBP/lf3BLSfNjTTSe+FxeWxHPAMuf6OcgF8ewYHuEKVISZgqVIr1xZoq2bTElT YN0GMiCILKlf87cZYIRNw/C6Zx8FUCpkGuupxcAoOb7ncYfZsMfkM0VYrpm2ELdHgOKA zhwCau1c07bCJOm8ckeWP/pwvJ2C565lPG1sJPWhrjSe06r4JQvf9e/MrXjg+lvMyYI8 2Si2xzKpIfaSdSfZh18YDMUO4XLQLSd+jw64lm0zlpzodYJsVUrbcC+HDZMbwtglaDGZ C0kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Fv/qAauV"; 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.47; Thu, 15 Aug 2019 02:01:47 -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="Fv/qAauV"; 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 S1730795AbfHOJBq (ORCPT + 3 others); Thu, 15 Aug 2019 05:01:46 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41175 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726120AbfHOJBq (ORCPT ); Thu, 15 Aug 2019 05:01:46 -0400 Received: by mail-wr1-f66.google.com with SMTP id j16so1577876wrr.8 for ; Thu, 15 Aug 2019 02:01:45 -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=LHJbGYYVd9anPfjjvOncYFmF6xF/5unBiz7afWnI4fY=; b=Fv/qAauVGznLCjxaHU1DlupK80IufloW7FEmG0b2QwK+vEM566prg2y7wNmNF7nDz1 XEX0KtMAEPc5RHIiAVcykpmAOdTqXyxoI3vdDorPaXURnnO8NZVri9/BXqmbOxxUiGd6 B4nixoybCPftkf685DXwqffd2apiYml4i1TPHwpf36x9+IK9EMG3CTIXcDKYFFyPO46e sARtFffmB13EmgcMXx2vQXJt1cM84u2AxwoQdXdQ9HWyQVLPcqMOCidcJLVVBoxLuolp sUPu39IecsAP2q6UZv23k432poHNbB2ROmoCnMCkMWUjOKR0mZWtMQi0ugzv0l0ZMhmE M+PQ== 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=LHJbGYYVd9anPfjjvOncYFmF6xF/5unBiz7afWnI4fY=; b=lpIiILnLvAouoY1CgGy16i0yr251NkBWiI84eTRt8R0+DoFxBXF6k6l/Xul2FODbrW ERbBu521DCOZbzy5FG9Aom8sy5XL63CXFJeMG2a2tjNxhzIDjBXfBPQZ1MG9qw3D+o7S bJRRI4te3Mmv3jS7c3jCMXk0beYAKw0p6YD6i8skW835uyZPopgI1/GG+1GFXmDLVfpj kx2Xx8labpr6sO0nJF3dAZBWn0Hn+3OKScgdUtWkH7S9usVuOhyX8VUwB8fZfA9OcgBG Ta4dPGSgjNpwXRKo2Yr8OFUgoeOKOc7X04+rhnJOXwSUmDSGQzMITEQn4B2bdRPjbPXk QHag== X-Gm-Message-State: APjAAAW1ZOH72uHX/0nCb/rJeBSM7s9HDxbn9PMlywjb6ngpHfFatLrn Dzl1hpmS1hkuEw7OgNjuVLJLNteHcrnNpyPY X-Received: by 2002:adf:f6d2:: with SMTP id y18mr4228361wrp.102.1565859704608; Thu, 15 Aug 2019 02:01:44 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Aug 2019 02:01:43 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH v5 11/30] crypto: hifn/des - switch to new verification routines Date: Thu, 15 Aug 2019 12:00:53 +0300 Message-Id: <20190815090112.9377-12-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/hifn_795x.c | 32 +++++--------------- 1 file changed, 8 insertions(+), 24 deletions(-) -- 2.17.1 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 5c3f02e4aece..a18e62df68d9 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); @@ -1939,25 +1939,13 @@ static void hifn_flush(struct hifn_device *dev) static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key, unsigned int len) { - struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); - struct hifn_context *ctx = crypto_tfm_ctx(tfm); + struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher); 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 = verify_ablkcipher_des_key(cipher, key); + if (err) + return err; dev->flags &= ~HIFN_FLAG_OLD_KEY; @@ -1972,15 +1960,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 = verify_ablkcipher_des3_key(cipher, key); + if (err) return err; - } dev->flags &= ~HIFN_FLAG_OLD_KEY;