Hi Jarkko,

On 10/23/21 8:48 AM, Jarkko Sakkinen wrote:

On Tue, 2021-10-19 at 18:04 +0800, Tianjia Zhang wrote:

quoted

According to https://tools.ietf.org/id/draft-oscca-cfrg-sm3-01.html,
SM3 always produces a 256-bit hash value and there are no plans for
other length development, so there is no ambiguity in the name of sm3.

Suggested-by: James Bottomley <redacted>
Signed-off-by: Tianjia Zhang <redacted>
---
  Documentation/security/keys/trusted-encrypted.rst | 2 +-
  crypto/hash_info.c                                | 4 ++--
  drivers/char/tpm/tpm2-cmd.c                       | 2 +-
  include/crypto/hash_info.h                        | 2 +-
  include/uapi/linux/hash_info.h                    | 3 ++-
  security/keys/trusted-keys/trusted_tpm2.c         | 2 +-
  6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst
index 80d5a5af62a1..3292461517f6 100644
--- a/Documentation/security/keys/trusted-encrypted.rst
+++ b/Documentation/security/keys/trusted-encrypted.rst

@@ -162,7 +162,7 @@ Usage::
                       default 1 (resealing allowed)
         hash=         hash algorithm name as a string. For TPM 1.x the only
                       allowed value is sha1. For TPM 2.x the allowed values
-                     are sha1, sha256, sha384, sha512 and sm3-256.
+                     are sha1, sha256, sha384, sha512 and sm3.

You cannot remove sm3-256 from uapi.

Thanks for pointing it out, Maybe this fix is more appropriate in patch 2.

Best regards,
Tianjia