From patchwork Thu Aug 15 09:00:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 171412 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1918167ily; Thu, 15 Aug 2019 02:01:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxhj6NyL0GODnwLvGJfL9aB44b7bz/gyuZL+qUK3gUv+pF5PY1G5sD5LawdaS9eMWN1O8NT X-Received: by 2002:a17:902:f082:: with SMTP id go2mr3558801plb.25.1565859709119; Thu, 15 Aug 2019 02:01:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565859709; cv=none; d=google.com; s=arc-20160816; b=JUNnEe3XEfa0bGdQfVvxteBmw6e4bKnfhhR2uhIJ/2MLnJJoqUHHwMg9N9h3BueC6J qRpc99rO9Scc9S7cPMn2MNbDc8zwDCTXk1skjLj2HnTkRUhfsjUQ8hTUm5lHHYKjDz0d mw5T9o37DKwCjss15OVLhbSPbtqWJgo2cvmVP/wnJyFKM77Ip5kDd9EbFg4YjyP8B35l vNc9FUoYR6V7ycjNbM0n1jrsbAq8pSNEpClrFBl3UIso6YjTpi0Y2VBpt/msAJwWT+dX b6GTWEDqzcraZ8P7jKngfjTUByHDg+szqKvVFzJ7hP0B62dRnoVEgKFekasjjQG6zTnH z7cw== 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=gMw1TSRrolAnfbeQ/pAAvmgP6ZTYCAswbG5wAAMeaMQ=; b=wCfL/fgBfW0lPjZe4WlXNQdpHOrxV2gL14N5t/JpBy479b9mlyDpW9XesIhafoJB2t HFgPKOwJp2wA/NZM+NU56DlOW+P5KIaKGKDPFR4QhogNuAL4g8IcS64JVeVhNiyp2G6H E4/hdGxgTVXZlvhN38aWPkBAPYxTX6juj8pk1lBfaY0oswl25877BxexnyleGH6WNxdH 8Gr6jsBlg4p52NKrTX3xW3a8bSe8bH/EXz8d5C0NnYTzyI4PMV9MwWpiVF2wYlYf8Lt8 dExX+pUF1vnfrgKQsIIe3korWOE1PdZ07iMG+KNAlCP3e3ldCGa4zR2t4TMYQ9j4hSu/ OLeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uGAWG73A; 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.48; Thu, 15 Aug 2019 02:01:49 -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=uGAWG73A; 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 S1726008AbfHOJBs (ORCPT + 3 others); Thu, 15 Aug 2019 05:01:48 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39216 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730793AbfHOJBs (ORCPT ); Thu, 15 Aug 2019 05:01:48 -0400 Received: by mail-wm1-f67.google.com with SMTP id i63so676743wmg.4 for ; Thu, 15 Aug 2019 02:01:46 -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=gMw1TSRrolAnfbeQ/pAAvmgP6ZTYCAswbG5wAAMeaMQ=; b=uGAWG73AY2khDOPO4pabFiwxsoz4Oo/oJENgw3mZgUg0b3WCor7L9hof8k286AEA9j zo13vQ65/X2UIclncpj8BPOSSYQGHL0+8giCf5QWdZfKhWH6jSKSzTQ6GskQvMqJmhGw ahgjK2rj9d3BSD2L2B9y4+IY66iO5D/3cbNV3m4BVOhwdiIRNy1O2bjb1GAmKod9Z9IP wrDgiwIG7AuFMWUGGyEUPHbhbTtOEWHzJ+l5+E1scQ/32hJirOtlFKTdstWg2vxBUDf6 0aBa39gBdHzaIdMwe3DXJiCc3VFzPrAQP602f5ToqZ8pfth1EVRDhoUvoaEGlffBMR9y pIlA== 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=gMw1TSRrolAnfbeQ/pAAvmgP6ZTYCAswbG5wAAMeaMQ=; b=sSGKAe+zbFus7zmgNjucL0vlT4IdYAy8VRoajxJclAqtpkjtvg2QuPciQWaz2TS7Kh aHQ9Wnhnug5GifKPpOd4oyhwTUVdZhgl4ltpjUiE/nS5ii3q4kQZJ7heOw6bhVWVTN4z WaxkOuCkj0hm+IzxrPV/x2AGuDTmxbSy056uCfGKD8zEvewS92sez8dpmHtTNX9/QIyy +d6nb3/q/6SPpaSCyscgWqN644Z5RjiTS/fPWS/PfIRBN6VSvq2h/skvF0j6Ptz8UQNZ nIZalpzbRErYR2eFnM9vKzG96hvR8vl8idsTrUeclDpwla2WhCSm7JHjWOgio6Iwko1u 3pQg== X-Gm-Message-State: APjAAAWviQj/jgfwOA5nrjP2LCrnmoeO5G5o3F90Qv/PBci2dLJB68An VPqL5JEkWteTt/+5a0K5dk9JY80UcRLrCaXp X-Received: by 2002:a05:600c:114e:: with SMTP id z14mr1593976wmz.161.1565859705931; Thu, 15 Aug 2019 02:01:45 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Aug 2019 02:01:45 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH v5 12/30] crypto: hisilicon/des - switch to new verification routines Date: Thu, 15 Aug 2019 12:00:54 +0300 Message-Id: <20190815090112.9377-13-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/hisilicon/sec/sec_algs.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c index 02768af0dccd..e0508ea160f1 100644 --- a/drivers/crypto/hisilicon/sec/sec_algs.c +++ b/drivers/crypto/hisilicon/sec/sec_algs.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include @@ -347,25 +347,21 @@ static int sec_alg_skcipher_setkey_aes_xts(struct crypto_skcipher *tfm, static int sec_alg_skcipher_setkey_des_ecb(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { - if (keylen != DES_KEY_SIZE) - return -EINVAL; - - return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64); + return verify_skcipher_des_key(tfm, key) ?: + sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64); } static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { - if (keylen != DES_KEY_SIZE) - return -EINVAL; - - return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64); + return verify_skcipher_des_key(tfm, key) ?: + sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64); } static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { - return unlikely(des3_verify_key(tfm, key)) ?: + return verify_skcipher_des3_key(tfm, key) ?: sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_3DES_ECB_192_3KEY); } @@ -373,7 +369,7 @@ static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm, static int sec_alg_skcipher_setkey_3des_cbc(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen) { - return unlikely(des3_verify_key(tfm, key)) ?: + return verify_skcipher_des3_key(tfm, key) ?: sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_3DES_CBC_192_3KEY); }