Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3345999pxv; Sun, 4 Jul 2021 16:10:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrq0DIPBCvYPqaNK1Mz2/ZjnMUeflG7hYX8Rb55hMQxRzz9GX9AYqX8KLrLdXsSMLqg14g X-Received: by 2002:aa7:c909:: with SMTP id b9mr12698310edt.1.1625440216218; Sun, 04 Jul 2021 16:10:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625440216; cv=none; d=google.com; s=arc-20160816; b=HKyVPdLDformrmDWwhbkCqm6mb4Ccq4KmAM0ElEXmR9lIJruc0VN0xQ9xGJixYReBa fedffjesuiggIe3nXsHX8rAfqqrMF5fm9c0dKNEnBJeiPOCkyyEaIDGVBJb3KV2/bXIq IiOdevbM9EfHR0EILYi0LLHB3DwDjQ6aXtFCiytvWmgGiFeZy1avFmF2oCrI3hszDzDF x44dXp0mHO9ImwZEtTF5l4o2uP+MdolTbYTuwol74yF1kZSBCGNY/vj7cIp395dhllSj 1xRIPOcRrk5m/eCovliMuX/sbIDcJ6W5HXowr5ModXeYtIU1mDSTmPP3Amsb6bZc+U4r /RFw== 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=eaZ3y5uzZEzW3Yv0UMExGPrE0jsE52/WudMKibS09RE=; b=nqxU6SKHBNVpqUNcHNuQTIW6QvDUn5BtLUriCzscepywVbsXnGpUXxi+MGSCNZqgFT Hu0eLo6RVXXJP7g9Uc5pTuI8Jca2TcnGQa1D+ILb7HuGEhMF2uQ8+/QahC0dj6AjD0OV fy6u/30svMfbdYXbnvR5pVBrUnGuNsmLaEVVAFJ6/5qvBuorO1eEEPQ5/g73+LARKtxK PUhWZRONDtN6bSrSW5tq6h36W/u3bJuZ11ha1COH4uyBSjn0LVWqhtEtaP465xgdomYr cbWoaC5BfGLrMlxKslTu5v2jKdJP33Nwnx1bC6ICWlCL02Y+3xw4xTXdxR/u4q0YSfay h2mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DQrRbOn9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si9752662eje.497.2021.07.04.16.09.53; Sun, 04 Jul 2021 16:10:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=DQrRbOn9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232206AbhGDXL1 (ORCPT + 99 others); Sun, 4 Jul 2021 19:11:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:47684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbhGDXKD (ORCPT ); Sun, 4 Jul 2021 19:10:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6EA9B613F1; Sun, 4 Jul 2021 23:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440038; bh=k6FFS/KA2Q+CKN1NE/2N+LNS14D2bJG97qZEbgZw+dQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQrRbOn9fTMl1p78Iem2abPI6Zpg12mp0ans5mpH9exQcYPNDSIwVHWoecVK54/lK aTFexB87Jv1rLr0petFhK73oHVHouGfIwWbxiBsnDsEYHVddRg248CQKB7zlEUA54/ WkGV6rFwlVPtOtcIHe3sOHHSVrEAwlgZTuAqz4zdXpVv9fyTjFC9cHGW6Y26HG1ZPz 3K1bZUM8XB+MIVkghlDfbb+G61sGgJ1XlXq1SrI7nllWqMpXAn9gUiV/xSqEe5b1rs XgkxbkSkw9bBAyWL/qnTjBlfWvFG8BFVNcFvPbvR9MfJbjdrIzKn2U4M+W+eM/XLdi 4cLBIGyo4+DNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai Ye , Herbert Xu , Sasha Levin , linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 45/80] crypto: hisilicon/sec - fixup 3des minimum key size declaration Date: Sun, 4 Jul 2021 19:05:41 -0400 Message-Id: <20210704230616.1489200-45-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Ye [ Upstream commit 6161f40c630bd7ced5f236cd5fbabec06e47afae ] Fixup the 3des algorithm minimum key size declaration. Signed-off-by: Kai Ye Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index 8adcbb327126..c86b01abd0a6 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -1513,11 +1513,11 @@ static struct skcipher_alg sec_skciphers[] = { AES_BLOCK_SIZE, AES_BLOCK_SIZE) SEC_SKCIPHER_ALG("ecb(des3_ede)", sec_setkey_3des_ecb, - SEC_DES3_2KEY_SIZE, SEC_DES3_3KEY_SIZE, + SEC_DES3_3KEY_SIZE, SEC_DES3_3KEY_SIZE, DES3_EDE_BLOCK_SIZE, 0) SEC_SKCIPHER_ALG("cbc(des3_ede)", sec_setkey_3des_cbc, - SEC_DES3_2KEY_SIZE, SEC_DES3_3KEY_SIZE, + SEC_DES3_3KEY_SIZE, SEC_DES3_3KEY_SIZE, DES3_EDE_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE) SEC_SKCIPHER_ALG("xts(sm4)", sec_setkey_sm4_xts, -- 2.30.2