Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp400832ybv; Fri, 7 Feb 2020 01:24:30 -0800 (PST) X-Google-Smtp-Source: APXvYqzGgYeEr6qM9eoKdCTpURpnG18zQCOIacCqmPs5GCJCtChGhbIRJ5u4JfMLWzmBiMjDQYlj X-Received: by 2002:aca:cdd0:: with SMTP id d199mr1429951oig.49.1581067470508; Fri, 07 Feb 2020 01:24:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581067470; cv=none; d=google.com; s=arc-20160816; b=hrbbB72+1iDQRDKK5rr3H3KlhuyNMlc/9FPPBlOdUXf6SACwMZjXTzsJoU3gpq3hQm XJCMoleI6Z0zQ8IQptHlzefwBECYFzVc96EMaZf9P4xtLR9hrMBYeqgJq18zHmmnYrtz MlRkwQy3dk6uMuLtblnBoW3dGgna+Mg5/0p93Si3wOu6ZXBQQ6ozSUn7W89Rmv+r9Kbh Agnfxx+xbpcs5of/hW5JFl/Y79NNXV+wX8RDrsy9XIyjttpU7l5FjK3P9VCLztoIUtLy 7mr0NBTqUrZ7n+Y4v+2hmpRdhlvQKX0g5RNLxI8YC8ZQAcBopyf2/54EuL84n23JLGQD eF8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=eMjmFj8fCD1lI97+TLslZbti8iLHiRjwd8sxjbJyjUw=; b=nE+puvZ2cliVWK8jqPd7Cc9D+rwC+Zs6aNp8Fx1swNLG+5AodA2ThXFRGlC3uvAt4f X8bKjdjctrlzfcOhuJrLB7Qfl+8giZzQTRCkmYhVsULXlLCOirHnTJZz7wng5CLOrkSj z+gn7d58Y1lQhAiScMdr+cHJ/Fl5FoGY24IAiihAhL18gwxvFSPEIYgWmMRQ5Rz8MI0Z IPkDqRWAY2J4UxBeYHFkz0JxxE76hscN+LZmsklP7T9aQjD7dfjQ/lnXBn45a42nKOKs uk3ucwaEDRthgRr4hJjRGC9ESVv7Thn6JeGaHU8v+ibVUD91Q2o3A/sKA0CXZ/nC3BJd q96A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r26si1414422otk.79.2020.02.07.01.24.18; Fri, 07 Feb 2020 01:24:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727131AbgBGJWi (ORCPT + 99 others); Fri, 7 Feb 2020 04:22:38 -0500 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:58115 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbgBGJWi (ORCPT ); Fri, 7 Feb 2020 04:22:38 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R801e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04455;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0TpLWpJm_1581067344; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0TpLWpJm_1581067344) by smtp.aliyun-inc.com(127.0.0.1); Fri, 07 Feb 2020 17:22:24 +0800 From: Tianjia Zhang To: herbert@gondor.apana.org.au, davem@davemloft.net, zohar@linux.ibm.com, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com Cc: linux-crypto@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ima: add sm3-256 algorithm to hash algorithm configuration list Date: Fri, 7 Feb 2020 17:22:19 +0800 Message-Id: <20200207092219.115056-3-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207092219.115056-1-tianjia.zhang@linux.alibaba.com> References: <20200207092219.115056-1-tianjia.zhang@linux.alibaba.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sm3-256 has been supported by the ima hash algorithm, but it is not yet in the Kconfig configuration list. After adding, both ima and tpm2 can support sm3-256 well. Signed-off-by: Tianjia Zhang --- security/integrity/ima/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 838476d780e5..27b5df895808 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -112,6 +112,10 @@ choice config IMA_DEFAULT_HASH_WP512 bool "WP512" depends on CRYPTO_WP512=y && !IMA_TEMPLATE + + config IMA_DEFAULT_HASH_SM3_256 + bool "SM3_256" + depends on CRYPTO_SM3=y && !IMA_TEMPLATE endchoice config IMA_DEFAULT_HASH @@ -121,6 +125,7 @@ config IMA_DEFAULT_HASH default "sha256" if IMA_DEFAULT_HASH_SHA256 default "sha512" if IMA_DEFAULT_HASH_SHA512 default "wp512" if IMA_DEFAULT_HASH_WP512 + default "sm3-256" if IMA_DEFAULT_HASH_SM3_256 config IMA_WRITE_POLICY bool "Enable multiple writes to the IMA policy" -- 2.17.1