Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2825049pxv; Mon, 12 Jul 2021 02:52:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1Nx65sEzsskGgzuryeflA+reH2KSyapkJ/X1VT4BETN6cGRe0rIm4W+V76wNLiQvU8xb9 X-Received: by 2002:a05:6638:2382:: with SMTP id q2mr35757640jat.35.1626083533784; Mon, 12 Jul 2021 02:52:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083533; cv=none; d=google.com; s=arc-20160816; b=FSLtn/EG7lm5XLx0joLoYmbFYPzqNur8OQq7GCFuyPRM0IoBoEUVXvR/Y5MDOl6YpR jY/eKaS55ymCV+Ix8zjhrQbxTWu6tkKxYm+DnH/sw191TZf34fXA5irjSIKPpL0sxOxX 4LTlgdJGEcNSBATwqGO7ewYIxsZr/r+qIVTytKOqbX2H6fvM0rt+eoZsoxdTAR3Lu+gy h51JdNWWc8Q9h1ImnW9HPQFUBbzn+ZDvzMHsNV5YTpeQd8Jv99ipCz29EH5uIf8TVtzN 7n/rGTIW03m66r284EejsXRf3XlCvsqJ5G5CfxIveeFigBmgWZf//FTjqoV+3nxkted8 TIOQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DmMs3ECiXXDxcRNVirFFtO7tc/B69EF3J5Pfi7RXQ54=; b=0wYTFkxOp2fL4yQCSLHi/GHA5iZkwLLqDDfGp20Y3Dp9gtZx9YQjQmfDLFk078AzqG jJWI0UlnkWUo4kcl2xIGAeklT8ffUV7ctv8wKGEoihnAbAlp6jtLCKRLL25rkFha7K7S PynS9YTV5F5Iv3vc8xXFJCM91ctoCRrMKi48fI0b7ZJ+bu7D+HVLExkzCfABdReZoWr8 CrrqdgqL++hF6P2ep4j2eX0/Ud61lCKFe0gjGXoMIQ1ukH2CavIc3AsTvgyGLx4y300h ISWkJ+fW/ISIKkAFhtgA0Xo+q2bCg4etLdZTTxyzPTek93EZ132OyzB8tKSzqXEX8vtp fECA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hQPr8Mpl; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s4si17556950ilv.54.2021.07.12.02.52.00; Mon, 12 Jul 2021 02:52:13 -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=@linuxfoundation.org header.s=korg header.b=hQPr8Mpl; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235953AbhGLGrh (ORCPT + 99 others); Mon, 12 Jul 2021 02:47:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:55424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235579AbhGLGgr (ORCPT ); Mon, 12 Jul 2021 02:36:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 14F486113B; Mon, 12 Jul 2021 06:33:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071605; bh=EwONuDiDclzvsM2MjoctyHGHG0D1+bQenust0cxuNPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQPr8MplXkqboXTLzlK/0cip8ca29e2VQmmXnAWYIGJzk+LpzcU8twKrLQfCbk6MH 4MfAaWKsHqjb1XZ/aMEs8tYELTMLqW+gO8hx4YYV0KVle+HnQNcFYNNBsVNzZCovlj 9VlYdl9ZwvWEqL0mV/DSq40kM0g0iTd9a8HIOURc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai Ye , Herbert Xu , Sasha Levin Subject: [PATCH 5.10 140/593] crypto: hisilicon/sec - fixup 3des minimum key size declaration Date: Mon, 12 Jul 2021 08:05:00 +0200 Message-Id: <20210712060858.485631131@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 41f1fcacb280..630dcb59ad56 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -1515,11 +1515,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