From patchwork Thu Feb 27 13:37:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230320 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 6652BC3F349 for ; Thu, 27 Feb 2020 14:25:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EF0A24697 for ; Thu, 27 Feb 2020 14:25:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813521; bh=bDVVnOPiBJFbAwok1eeBcXQx8jGyj50nZqeS8zCYhbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1Slkab4VVjk29jfdtVDLo9LRcCiWqyih2IAQsAMU7ZKNAehnSmfCt57v/f1AWrW1V drIjZIyoFhrXM44IsQlgWP3VmW+t7kUlFIbOm2ox/3wTfPoyk0G4sp5FXdnQ42sFVQ IKI8kGuDXIaqxhI8gb3/tgWw2F+mCDuW8cfmgcE8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730687AbgB0OZQ (ORCPT ); Thu, 27 Feb 2020 09:25:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:50116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388707AbgB0OLf (ORCPT ); Thu, 27 Feb 2020 09:11:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D504421D7E; Thu, 27 Feb 2020 14:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812695; bh=bDVVnOPiBJFbAwok1eeBcXQx8jGyj50nZqeS8zCYhbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qwuM4j7QeuZeMS58/anQnEUqbchWL3Gj06m4cxjwnlcbTAPFHCRxCdLRTHfRE5Wvx SCDLe8XAJtUr44Nj/YWkFJu/OhUtYDxkm+5FtC98zaEZWl9gkTzgfE8rHZ53a04iZd IWfsTE1pL2Dt7oLQZLqWNJlRg7Bj2gSsxYfNxhfc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tianjia Zhang , Pascal van Leeuwen , Mimi Zohar Subject: [PATCH 5.4 117/135] crypto: rename sm3-256 to sm3 in hash_algo_name Date: Thu, 27 Feb 2020 14:37:37 +0100 Message-Id: <20200227132246.727382171@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132228.710492098@linuxfoundation.org> References: <20200227132228.710492098@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tianjia Zhang commit 6a30e1b1dcad0ba94fae757f797812d7d8dcb72c upstream. 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. Fixes: 5ca4c20cfd37 ("keys, trusted: select hash algorithm for TPM2 chips") Signed-off-by: Tianjia Zhang Reviewed-by: Pascal van Leeuwen Signed-off-by: Mimi Zohar Signed-off-by: Greg Kroah-Hartman --- crypto/hash_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/crypto/hash_info.c +++ b/crypto/hash_info.c @@ -26,7 +26,7 @@ const char *const hash_algo_name[HASH_AL [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", };