From patchwork Fri Jun 28 09:35:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168027 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3454492ilk; Fri, 28 Jun 2019 02:35:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1oQDvzhoDDDN47So2TQXuOVJT2QMRiQp5PR0a23bcZBGSTEGFlxChk39VwOC7Bd7vTVU/ X-Received: by 2002:a17:90a:b903:: with SMTP id p3mr11728882pjr.79.1561714548874; Fri, 28 Jun 2019 02:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561714548; cv=none; d=google.com; s=arc-20160816; b=GfpF+Uo1INWYel1YKAvdcAv4tnlxiub2aDTdHdekdCJxH5qz1GUWMIkURM2giHFKAF baZHp8BtytAze1vWuu+G08s3EIAR8rhHzx37GulRX64O7FgGfL/G0hbYhKHwluy26ZJk y74fAIxsZjNI5UenugUyJzRjeHmtUNK8+eQgfopnj9X9PUbMlHtqNU/GIQNDZqVHOqAv wmg1PmoETsK4SIgekSgHrDS12I5CffsmXn/a+f6YXM1Hy5hmNOfoDkF64pqXahNGF9vy r+DNBNIpA5cFwD5UKXPRxdQE6DXSiVAc7DILA/6az0ajFFXGTNAU8tykBBSh4zROkVs0 s0EA== 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=Y8cozxp6Xii9yB6DFN4x0vfTCcaxHuhUPOIZlSSDZJs=; b=rjBDFQ76qjsLkQ64MlAJA8xsQGsURX1w9HqLhc9RGJhS4YhwTmWfxCnlR6LWeuuE7d tARsFLtci4hlldgrYj8y6ZiLKizdcgVry45fS9LC+iggzAllcmR9AxHgfJasf5G9j4q6 lb+LLDa+sXWWTSYULwurfXgldOKB5tscSKDRQxGphR3DwQurOKSVfEaLD84ycq9x/4yp OU+MZuZ+stqCHcwg+M63WIAnuXzl99AJOcQQcSa0tyKUeo9znP4jAeBbjvt54bzzlK26 xla2lktSFirCtKKeRGdMCb5/dk3Js1F7dOv6ppDpPbzvL7lHCPbzZnPQ1+PbPDE4eaJz U+pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gY1RcBtV; 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.48; Fri, 28 Jun 2019 02:35:48 -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=gY1RcBtV; 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 S1726669AbfF1Jfs (ORCPT + 3 others); Fri, 28 Jun 2019 05:35:48 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40050 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726656AbfF1Jfs (ORCPT ); Fri, 28 Jun 2019 05:35:48 -0400 Received: by mail-wr1-f66.google.com with SMTP id p11so5535659wre.7 for ; Fri, 28 Jun 2019 02:35: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 :mime-version:content-transfer-encoding; bh=Y8cozxp6Xii9yB6DFN4x0vfTCcaxHuhUPOIZlSSDZJs=; b=gY1RcBtVeSmaeK2JwBw4azY0/038ytn50aEb5jF37R6pDaYZO/FwbsN6xlFUhqvEmN xcXw6mXMdIQ9prWvTbZjnLtedp1gdF2lIYJbPcpAjQObDibMAbge1s6t9U/nPlR+Igr0 Km2KIWD5ysRQ6FNY7BPy9ZzcbSs7gogfU5oPk/3V8O+hSd07L8xMcklpseHlRjMTUj4u 9376Vrnjlt1/D8CjnPjuC584a0HxSHzzAY5usvk3oodlS4paek2S3bhoz6SagNFsykv4 IbU07nP0wdpcPyeWuZ9l2/QzG22so4u90QuqvT5tIzOt1k8lG2WUdKUgH8N5GTOsinYq TZzg== 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=Y8cozxp6Xii9yB6DFN4x0vfTCcaxHuhUPOIZlSSDZJs=; b=NYvk2UPECcKU2YeKRTXj81aXLfo6wX89IsphQUHqsi5WaB85auvLUTphtuvskDd5sW objA4hhRjxR9E+aQiuAMkhgF6xAL4w+0mPmv5FUgtNDngFSjY7nS/EnvwBREmP1H7Uou p/4TLby7d5gG13KbPEIQDP0AtuE0E5hDboeX30eFERCvh1loJUiF9tZAE5KPkKIUYFkZ 2nMHVIzo/g9/Zak5tjp74SVUm4oNdCosXVmkeoBMh9DwuTQ7s2BTQhMR2bNDHrYIJSIY yuI64P3rmy1oU2Uoa1UZgS0s5/gsMP7F+lgFUQ3rL43u3j3vEnhLkdzgKJkV2g6kaWj3 aOpA== X-Gm-Message-State: APjAAAXfW7zRAd69azJpGLIEGgWXSxkHi+I+8YFssHS2qoAurs6O015F dX1Mf5+MtEtSYONW18IgC3p/GjwZf1FDNQ== X-Received: by 2002:adf:bc4a:: with SMTP id a10mr484455wrh.230.1561714546055; Fri, 28 Jun 2019 02:35:46 -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.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 02:35:44 -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 07/30] crypto: cpt/des - switch to new verification routines Date: Fri, 28 Jun 2019 11:35:06 +0200 Message-Id: <20190628093529.12281-8-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/cavium/cpt/cptvf_algs.c | 26 ++++---------------- 1 file changed, 5 insertions(+), 21 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/cavium/cpt/cptvf_algs.c b/drivers/crypto/cavium/cpt/cptvf_algs.c index f6b0c9df12ed..a42b531c12d0 100644 --- a/drivers/crypto/cavium/cpt/cptvf_algs.c +++ b/drivers/crypto/cavium/cpt/cptvf_algs.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -325,31 +325,15 @@ static int cvm_cfb_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key, static int cvm_cbc_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key, u32 keylen) { - u32 flags = crypto_ablkcipher_get_flags(cipher); - int err; - - err = __des3_verify_key(&flags, key); - if (unlikely(err)) { - crypto_ablkcipher_set_flags(cipher, flags); - return err; - } - - return cvm_setkey(cipher, key, keylen, DES3_CBC); + return crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key) ?: + cvm_setkey(cipher, key, keylen, DES3_CBC); } static int cvm_ecb_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key, u32 keylen) { - u32 flags = crypto_ablkcipher_get_flags(cipher); - int err; - - err = __des3_verify_key(&flags, key); - if (unlikely(err)) { - crypto_ablkcipher_set_flags(cipher, flags); - return err; - } - - return cvm_setkey(cipher, key, keylen, DES3_ECB); + return crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key) ?: + cvm_setkey(cipher, key, keylen, DES3_ECB); } static int cvm_enc_dec_init(struct crypto_tfm *tfm)