From patchwork Fri Jun 28 09:35:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168036 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454635ilk; Fri, 28 Jun 2019 02:35:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzFgUkzlF/LD+cuIcv3NT1eKzG8FIGVpt4+DBiEkk1ftDl4fxt10HF76C2Mh335B85++Qg X-Received: by 2002:a17:90b:d82:: with SMTP id bg2mr12108071pjb.87.1561714557849; Fri, 28 Jun 2019 02:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714557; cv=none; d=google.com; s=arc-20160816; b=hja/PPrdjebp7QtBjOC9xsEqrFgD198hZ+CjSem1o4yimTHTmzCSDYxJk1z1Sv9SLR mtfsPwaymohwdm/zVkmNA/FkNRgZqIvvleOTn6XTobQauSl6Mf2GV34Tk9Ugi06Lm5oA rYlnNs3Qtpai3xy+DG7c8EHHQLTqUPlBxVJLTJ36BZOy8MyuuCWpjmjn5MA6huKRrpxx OCnE1IljzC/48g4NynWYMtXPNnQ87og1h3W+Ej0yMgFEWb5l7kC+fcheoFI7/ckSIC1x D2zspLCVZr8qhx752cg8HQA4Y4GsQU3Br4ubDg54gjFLo9g0saNfnBt6doiHAjiIrtzS qFZA== 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=k/iZYvi+pgbmK6dBlOMIArAvCwNQqEFpOEidZ0EvGck=; b=FZN9A/0uOEp+hX2ve1FYRIqodQGo9Ljn2SWDx1nvN05MflW6FGPZ3NMNWdJ0gXg+Ej Z4VynHpxfvZNr+n6SinT6ceMd5CQ9NMf3OZKySZ13c8yIbCNoJNrgsXB9RXPl4i1HnXM +viJMSGwk02plPcB9hMuG7r4F9IDqGCqB47Z3lFm79o1urL9+657Nc6wvGAGpli0zIWx rutFa1qm3k0vls77Ic3mFmGNkevJh2rcYaMglIuYm8LKsRbCAxcXbR1hZI1bNy3uAYDv 7yu+9r+XNz8wAeLn9TvkcTDqwyfY4NWGDPiZ64HeTEKbB524KJTIXTxMt47TKgLO1oZ3 2pCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JL6dJcEm; 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.57; Fri, 28 Jun 2019 02:35:57 -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=JL6dJcEm; 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 S1726632AbfF1Jf5 (ORCPT + 3 others); Fri, 28 Jun 2019 05:35:57 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54305 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726681AbfF1Jf4 (ORCPT ); Fri, 28 Jun 2019 05:35:56 -0400 Received: by mail-wm1-f68.google.com with SMTP id g135so8408004wme.4 for ; Fri, 28 Jun 2019 02:35:55 -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=k/iZYvi+pgbmK6dBlOMIArAvCwNQqEFpOEidZ0EvGck=; b=JL6dJcEm7zigYiHSV8iF2rHPxsUkVqGaqOChxW+zU6EEycdZt/Gngzcbkm8P9sz01U g5Bob62H6tLhOjW5BG8DyKQiwUWNxW0gTBbOZf6ESG+mjSptO5+5hIBKzj0Xe8TrtDr8 EfB7OgLI2VxcYiFsP+mDtHKbOwbakqMzG7gFOI5z3XD18Djf7fIbUm7vsSD0/bafQUCI CC0x54fV/VH3EO6qR+V+McmS4EbFraVZcsYKwDwrb2ymumrr3URyieFR7W+SzqGy9Uzu I7AhuiyLgDpOPtoJuORNHlrqnlgc7wzXrEbatUfFUQ862PcQeJf6erFE1DX2xRf4x5Id udSg== 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=k/iZYvi+pgbmK6dBlOMIArAvCwNQqEFpOEidZ0EvGck=; b=nlSI8drrVDBR5bT04r84S5rRpXVszKmJ7tDSgW0Dv5111YGBsdbN6UQ8eUDjZAyVhx +dtN6hpxfPCB7kEidUQaOEHDIF81r+ifdsRTd1dbCDjG2inNgCj24ZAxKPGuyulbVFud 2xVt8P/ZznhoTSSXu023QgPCAyYMoT72iZKhhnSl1ICaYq79OfTax+pjYqYmMdoUfegh Zuskvau8TO+Oh9EsVPY5BelZqGy4I2iGQ5w0F5ZLDw0rCTKzcO1BagSfWtJ4UESBQOPg YiaUNWilqdRBoQwhC8xuqaDxbrqbCuic+uhMgbjo7hSSfE4+A/+WklqykSdYLnRSpM6a VTUA== X-Gm-Message-State: APjAAAUGyFOQAbZyoxCnzpSVaBy7Gzo5/D8KBEncjIJuGWMrHVz+Py4M 1DxpTnjijBbAeJ5r9BvPMluu6KEH7sBD+Q== X-Received: by 2002:a1c:f20c:: with SMTP id s12mr7016092wmc.151.1561714554746; Fri, 28 Jun 2019 02:35:54 -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.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:53 -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 15/30] crypto: cesa/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:14 +0200 Message-Id: <20190628093529.12281-16-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/marvell/cipher.c | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c index 2fd936b19c6d..5182438a957c 100644 --- a/drivers/crypto/marvell/cipher.c +++ b/drivers/crypto/marvell/cipher.c @@ -13,7 +13,7 @@ */ #include -#include +#include #include "cesa.h" @@ -277,19 +277,11 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key, { struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher); struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm); - u32 tmp[DES_EXPKEY_WORDS]; - int ret; - - if (len != DES_KEY_SIZE) { - crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); - return -EINVAL; - } + int err; - ret = des_ekey(tmp, key); - if (!ret && (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; memcpy(ctx->key, key, DES_KEY_SIZE); @@ -302,8 +294,8 @@ static int mv_cesa_des3_ede_setkey(struct crypto_skcipher *cipher, struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher); int err; - err = des3_verify_key(cipher, key); - if (unlikely(err)) + err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(cipher), key); + if (err) return err; memcpy(ctx->key, key, DES3_EDE_KEY_SIZE);