From patchwork Thu Feb 11 20:01:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thara Gopinath X-Patchwork-Id: 381033 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp2373630jah; Thu, 11 Feb 2021 12:04:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6vgR8r0U17f5J4+GrNpBGK7Q01cO6ATKE0hFpke46Clbf9if1TDn4LNaU2Y0K8dWdffHR X-Received: by 2002:aa7:d345:: with SMTP id m5mr10139227edr.30.1613073858268; Thu, 11 Feb 2021 12:04:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613073858; cv=none; d=google.com; s=arc-20160816; b=gNPK+zxiAzYnq6vKAMIsLTHGUpM/SD0V8+p7zOfrIJqra+uKMXmtHuISCdSPmWnN/K sEPLvsonrIuzAkD4IjGOfUzi6W9mYbsowBNr/z/C0vSbIF0DA+4tx+ftWFmtHuwvuM27 /RZrXMWefW1lWqXyw+vswM3yJ8u8eXU61l4M4SIzN6wupRFYfAWrpiO1WnJKJtxmQjHA /KjtlRk8URVl0qD/IOcJV24+3kVCRbGjewfrBB8ZVwGMqQ9VTWggSdxAourAyFMzEJWZ IM67LCP4SuL/QVPLlYmziK8m1UrIpT20sh0KiiJH4xSjsvf1RMYsgE0Ng+HefCxKKsFu 9y/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N23pUSUU7iQvfUHxPcNVoEdixxNGRArc1osHV7Hwol4=; b=U6JPSbCUPSpNRjlSWMXSfFy2Q/b55dPMi0Y7GhMS7x7Xvv3rK56daZAYdZS/ZhUStm evrKPCSkHJIQFtVG/id72+4zuoexymU4RYITWdRp57IrNVFDu2fxrX2M+iyre0+CN9zx h0G3FtjFKSdy+5kPPxeL8IsPi+iFVwCIlzAbzgL7mjz0gEnPOKWKjtztmkNsTSkUB57T Lc+ywZXJaD4bH/6fGQFkLB+b8VNJ3taQEA8frBHDIDHT+446Aus3Ld3xePZedIAeg9lr ZDSvHCyna73F2ZfvsDfMjV3mxGlhsU4Dnuk5+l7YHU1OFGE/Zhe4Wl1YoVNGlNYALCFz /6Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BR602T06; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id t20si4378108eju.239.2021.02.11.12.04.18; Thu, 11 Feb 2021 12:04:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BR602T06; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 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 S231273AbhBKUDw (ORCPT + 2 others); Thu, 11 Feb 2021 15:03:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbhBKUC7 (ORCPT ); Thu, 11 Feb 2021 15:02:59 -0500 Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA432C061797 for ; Thu, 11 Feb 2021 12:01:34 -0800 (PST) Received: by mail-qt1-x82d.google.com with SMTP id e15so5078099qte.9 for ; Thu, 11 Feb 2021 12:01:34 -0800 (PST) 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=N23pUSUU7iQvfUHxPcNVoEdixxNGRArc1osHV7Hwol4=; b=BR602T063Y8RPEJhaSQOgDGirNGVDhshaj5wcH3Ip3MZ4Dl0dW83XYly599Wf8K/Ch eHeXsDgpVBTukHj7p4U0AZPeyzPlpGTBvV39ct3vSn0af4fcoMjTy0ZvzQIjvZS0zOLt afb3oKaf/O4JoX/VaN8jCtxMHMFEQ7lVsBx1NOM7qa14CtxlTT/mT7LLNv7SY/cNASHI iaP+SH+vR1Eab6CRcfwtgX/RfIYU8QYOf7JHeEel1Yja+tuuP5GQ4ii0H5Q6JH9GTwTi pnVA8YTbV2RNsoMQuc6Jsz14rOmXu8HlgoRVSFxERNwfUXX6ljOrrAQva4ZtAPzn2PFk mJpQ== 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=N23pUSUU7iQvfUHxPcNVoEdixxNGRArc1osHV7Hwol4=; b=X+KC4HmULNb2ahoof9OSD3C2IEG+4MddQKmaTvliPyKbUg09qzhdOFo3gh/EtP6S+l Zu4zmp8+O5jlDvpBnYMr7bP4cAXSRs0IksEMS12GF+Ss/2JbNAinEAaO1F2ZvkO7oN1g J0o42qQfX+htgjOUD/LrmIRPsSQbtixhgULqmsFRhEUTY0LJX4B3TyexcxJZnbgKzDQq /qAe0e+j75G/rxLVX7/oUnHxu9TSHhiw+hxZ12GowAeh0+iUkhXJj3G7HtFp88e0TVZ0 yObBKMXWkvI1Vdxcvxj6vj/TSuqU4iyYtRAbKMhOVkqwyHNZ4oOzB5TYs0Po6wj55PMs 4ADQ== X-Gm-Message-State: AOAM532d+QAvl8vSRCKrjWcgWfIYtQ1pUIm32rFaluxpJTQVftvTFqbI xlK2HZt6fsXxOHVo92hwFh81lQ== X-Received: by 2002:a05:622a:552:: with SMTP id m18mr9217830qtx.207.1613073693947; Thu, 11 Feb 2021 12:01:33 -0800 (PST) Received: from pop-os.fios-router.home (pool-71-163-245-5.washdc.fios.verizon.net. [71.163.245.5]) by smtp.googlemail.com with ESMTPSA id 17sm4496243qtu.23.2021.02.11.12.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 12:01:33 -0800 (PST) From: Thara Gopinath To: herbert@gondor.apana.org.au, davem@davemloft.net, bjorn.andersson@linaro.org Cc: ebiggers@google.com, ardb@kernel.org, sivaprak@codeaurora.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 04/11] crypto: qce: skcipher: Return unsupported if any three keys are same for DES3 algorithms Date: Thu, 11 Feb 2021 15:01:21 -0500 Message-Id: <20210211200128.2886388-5-thara.gopinath@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210211200128.2886388-1-thara.gopinath@linaro.org> References: <20210211200128.2886388-1-thara.gopinath@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Return unsupported if any three keys are same for DES3 algorithms since CE does not support this and the operation causes the engine to hang. Signed-off-by: Thara Gopinath --- v6->v7: - Fixed sparse warning in patch 4 as pointed out by Herbert Xu. This means the checking if any two keys are same for triple des algorithms has been reverted back to using conditional OR instead of using bitwise OR. drivers/crypto/qce/skcipher.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.25.1 diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c index 12955dcd53dd..8aeb741ca5a3 100644 --- a/drivers/crypto/qce/skcipher.c +++ b/drivers/crypto/qce/skcipher.c @@ -221,12 +221,27 @@ static int qce_des3_setkey(struct crypto_skcipher *ablk, const u8 *key, unsigned int keylen) { struct qce_cipher_ctx *ctx = crypto_skcipher_ctx(ablk); + u32 _key[6]; int err; err = verify_skcipher_des3_key(ablk, key); if (err) return err; + /* + * The crypto engine does not support any two keys + * being the same for triple des algorithms. The + * verify_skcipher_des3_key does not check for all the + * below conditions. Return -ENOKEY in case any two keys + * are the same. Revisit to see if a fallback cipher + * is needed to handle this condition. + */ + memcpy(_key, key, DES3_EDE_KEY_SIZE); + if (!((_key[0] ^ _key[2]) | (_key[1] ^ _key[3])) || + !((_key[2] ^ _key[4]) | (_key[3] ^ _key[5])) || + !((_key[0] ^ _key[4]) | (_key[1] ^ _key[5]))) + return -ENOKEY; + ctx->enc_keylen = keylen; memcpy(ctx->enc_key, key, keylen); return 0;