From patchwork Wed Sep 14 08:51:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elliott, Robert \(Servers\)" X-Patchwork-Id: 606319 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8BB4ECAAD3 for ; Wed, 14 Sep 2022 08:52:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229582AbiINIwI (ORCPT ); Wed, 14 Sep 2022 04:52:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbiINIwH (ORCPT ); Wed, 14 Sep 2022 04:52:07 -0400 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A435F9A7; Wed, 14 Sep 2022 01:52:06 -0700 (PDT) Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28E87YFK005790; Wed, 14 Sep 2022 08:51:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pps0720; bh=OO19sj1nrjuLI9FfnQwrBekSePzYL8wn1rlle6iX61Q=; b=kzb02ax1B4TNqqAiJtHQL+4IK0Itiv25SOdthaWsCFs+c9/IrlCa2DxGM2tkVHY0cpbr s1eTy46ZjMDmxr1ECh03SXP2mHIsZ2lf5G9k5hNiIx413zjOec9zy23Q4CWXQ1IqloHR tCVBUVhX0nyJ25A71BV8fPvMSCqmBslejk4PkJbEKUdiBz7NHko+fRV2YIqLA2YuE8TL 73h7/Sj2Bsf0kbycAKsxsJqoZyH6UaQQDiU9qf6cC6jS8wFuimpHB1nqekmPi6GJMqTP 7Rb9KYnTXaVL8nQHzEwafyTic4rkbi5FNmtDue8DkGlGv0wqsjwbtgElFnOvT6x6U/qS 7A== Received: from p1lg14879.it.hpe.com (p1lg14879.it.hpe.com [16.230.97.200]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3jk55vuqnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Sep 2022 08:51:57 +0000 Received: from p1lg14886.dc01.its.hpecorp.net (unknown [10.119.18.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14879.it.hpe.com (Postfix) with ESMTPS id 6CBDAD24E; Wed, 14 Sep 2022 08:51:56 +0000 (UTC) Received: from adevxp033-sys.us.rdlabs.hpecorp.net (unknown [16.231.227.36]) by p1lg14886.dc01.its.hpecorp.net (Postfix) with ESMTP id A83D180171D; Wed, 14 Sep 2022 08:51:55 +0000 (UTC) From: Robert Elliott To: herbert@gondor.apana.org.au, davem@davemloft.net, lukas.bulwahn@gmail.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Robert Elliott Subject: [PATCH 1/2] crypto/arm64: Kconfig - fix SHA1 symbol name Date: Wed, 14 Sep 2022 03:51:20 -0500 Message-Id: <20220914085121.1808274-1-elliott@hpe.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Proofpoint-GUID: FooX2_pGw5FWt_ovaxVDh3SSCELlTBLQ X-Proofpoint-ORIG-GUID: FooX2_pGw5FWt_ovaxVDh3SSCELlTBLQ X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-14_03,2022-09-14_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 impostorscore=0 mlxlogscore=873 malwarescore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209140043 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org In the arm64 Kconfig file, revert an incorrect change of the symbol name CRYPTO_SHA1_ARM64_CE to CRYPTO_SHA1_ARM64. Fixes: 3f342a23257d ("crypto: Kconfig - simplify hash entries") Reported-by: Lukas Bulwahn Signed-off-by: Robert Elliott --- arch/arm64/crypto/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index 7ba9bcb6d409..8bd80508a710 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -36,7 +36,7 @@ config CRYPTO_POLY1305_NEON Architecture: arm64 using: - NEON (Advanced SIMD) extensions -config CRYPTO_SHA1_ARM64 +config CRYPTO_SHA1_ARM64_CE tristate "Hash functions: SHA-1 (ARMv8 Crypto Extensions)" depends on KERNEL_MODE_NEON select CRYPTO_HASH From patchwork Wed Sep 14 08:51:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Elliott, Robert \(Servers\)" X-Patchwork-Id: 605908 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2DA2ECAAD8 for ; Wed, 14 Sep 2022 08:52:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229781AbiINIwJ (ORCPT ); Wed, 14 Sep 2022 04:52:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbiINIwH (ORCPT ); Wed, 14 Sep 2022 04:52:07 -0400 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 815895F99C; Wed, 14 Sep 2022 01:52:06 -0700 (PDT) Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28E87Y40005765; Wed, 14 Sep 2022 08:52:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pps0720; bh=u+/SFtI5p8K0lNeVYWMyM98e41leFnaV0WpGTye5n64=; b=V5ePB/cfaWfRnnNBqS1IUnYIX8YkucaEvBWpIEVRAis8/K1YqD4BolcaBifMkwPY0Od5 nEMI6tYgDKv8vCkxywNSV9owq9LruUyDyH9ck/9vIMnyxnGyi7wK1RkuxhItWJTzvpFv VzeL9ia09cw/O3JJpc8pIo5+WCE5weBz+wqaI0UVmSbDFg0CP8pGnRNS4JnaE9kc/ZPZ Vnc03xadtbUpYeQAVsmKR1wefD6dvBkrwp35U07ewTGR4xL1DCsw1t2rd9+KdrKInkcY CntNo3gYoTFQwKruXvVfGYXKnrO8r6J2uS5HNsheeV77s5FybEJgLNEUp/AkdruC1Xyd Aw== Received: from p1lg14878.it.hpe.com (p1lg14878.it.hpe.com [16.230.97.204]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3jk55vuqp9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Sep 2022 08:52:00 +0000 Received: from p1lg14886.dc01.its.hpecorp.net (unknown [10.119.18.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14878.it.hpe.com (Postfix) with ESMTPS id 26FFAD25E; Wed, 14 Sep 2022 08:51:59 +0000 (UTC) Received: from adevxp033-sys.us.rdlabs.hpecorp.net (unknown [16.231.227.36]) by p1lg14886.dc01.its.hpecorp.net (Postfix) with ESMTP id BE1558080C8; Wed, 14 Sep 2022 08:51:58 +0000 (UTC) From: Robert Elliott To: herbert@gondor.apana.org.au, davem@davemloft.net, lukas.bulwahn@gmail.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Robert Elliott Subject: [PATCH 2/2] crypto: Kconfig - remove CRYPTO_BLAKE2S symbol Date: Wed, 14 Sep 2022 03:51:21 -0500 Message-Id: <20220914085121.1808274-2-elliott@hpe.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220914085121.1808274-1-elliott@hpe.com> References: <20220914085121.1808274-1-elliott@hpe.com> X-Proofpoint-GUID: oImM5O_cLGpMkBEvrI3rrcwtbBCfBKIc X-Proofpoint-ORIG-GUID: oImM5O_cLGpMkBEvrI3rrcwtbBCfBKIc X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-14_03,2022-09-14_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 suspectscore=0 impostorscore=0 mlxlogscore=999 malwarescore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209140043 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Revert an incorrect change that reintroduced the CRYPTO_BLAKE2S symbol that was removed by commit 2d16803c562e ("crypto: blake2s - remove shash module"). Fixes: 3f342a23257d ("crypto: Kconfig - simplify hash entries") Signed-off-by: Robert Elliott --- crypto/Kconfig | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index e93da749f31b..8346e591d8df 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -916,27 +916,6 @@ config CRYPTO_BLAKE2B See https://blake2.net for further information. - config CRYPTO_BLAKE2S - tristate "BLAKE2s" - select CRYPTO_LIB_BLAKE2S_GENERIC - select CRYPTO_HASH - help - BLAKE2s cryptographic hash function (RFC 7693) - - BLAKE2s is optimized for 8 to 32-bit platforms and can produce - digests of any size between 1 and 32 bytes. The keyed hash is - also implemented. - - This module provides the following algorithms: - - blake2s-128 - - blake2s-160 - - blake2s-224 - - blake2s-256 - - Used by Wireguard. - - See https://blake2.net for further information. - config CRYPTO_CMAC tristate "CMAC (Cipher-based MAC)" select CRYPTO_HASH