From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20D7BC35242 for ; Tue, 11 Feb 2020 21:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFF292073C for ; Tue, 11 Feb 2020 21:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727696AbgBKVtc (ORCPT ); Tue, 11 Feb 2020 16:49:32 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:63726 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727264AbgBKVt3 (ORCPT ); Tue, 11 Feb 2020 16:49:29 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01BLmk3W013999 for ; Tue, 11 Feb 2020 16:49:28 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2y1ufmrw0x-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Feb 2020 16:49:28 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Feb 2020 21:49:26 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 11 Feb 2020 21:49:22 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01BLnLwb34799720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2020 21:49:21 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 33A3011C058; Tue, 11 Feb 2020 21:49:21 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7E69B11C052; Tue, 11 Feb 2020 21:49:19 +0000 (GMT) Received: from localhost.localdomain (unknown [9.85.128.4]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2020 21:49:19 +0000 (GMT) Subject: Re: [PATCH 1/2] crypto: rename sm3-256 to sm3 in hash_algo_name From: Mimi Zohar To: Tianjia Zhang , herbert@gondor.apana.org.au, davem@davemloft.net, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com, ebiggers@kernel.org Cc: linux-crypto@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 11 Feb 2020 16:49:19 -0500 In-Reply-To: <20200210124440.23929-2-tianjia.zhang@linux.alibaba.com> References: <20200210124440.23929-1-tianjia.zhang@linux.alibaba.com> <20200210124440.23929-2-tianjia.zhang@linux.alibaba.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 20021121-0016-0000-0000-000002E5F3FA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20021121-0017-0000-0000-00003348EC0C Message-Id: <1581457759.5125.18.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-11_06:2020-02-11,2020-02-11 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 priorityscore=1501 mlxscore=0 adultscore=0 clxscore=1015 mlxlogscore=999 bulkscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002110141 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2020-02-10 at 20:44 +0800, Tianjia Zhang wrote: > The name sm3-256 is defined in hash_algo_name in hash_info, but the > algorithm name implemented in sm3_generic.c is sm3, which will cause > the sm3-256 algorithm to be not found in some application scenarios of > the hash algorithm, and an ENOENT error will occur. For example, > IMA, keys, and other subsystems that reference hash_algo_name all use > the hash algorithm of sm3. > > Signed-off-by: Tianjia Zhang The "hash_map" needs to be updated to reflect this change. static struct tpm2_hash tpm2_hash_map[] = {         {HASH_ALGO_SHA1, TPM_ALG_SHA1},         {HASH_ALGO_SHA256, TPM_ALG_SHA256},         {HASH_ALGO_SHA384, TPM_ALG_SHA384},         {HASH_ALGO_SHA512, TPM_ALG_SHA512},         {HASH_ALGO_SM3_256, TPM_ALG_SM3_256}, }; Mimi > --- > crypto/hash_info.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/crypto/hash_info.c b/crypto/hash_info.c > index c754cb75dd1a..a49ff96bde77 100644 > --- a/crypto/hash_info.c > +++ b/crypto/hash_info.c > @@ -26,7 +26,7 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = { > [HASH_ALGO_TGR_128] = "tgr128", > [HASH_ALGO_TGR_160] = "tgr160", > [HASH_ALGO_TGR_192] = "tgr192", > - [HASH_ALGO_SM3_256] = "sm3-256", > + [HASH_ALGO_SM3_256] = "sm3", > [HASH_ALGO_STREEBOG_256] = "streebog256", > [HASH_ALGO_STREEBOG_512] = "streebog512", > };