2021-10-19 10:04:49

by Tianjia Zhang

Subject: [PATCH v2 1/2] crypto: use SM3 instead of SM3_256

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 <[email protected]>
Signed-off-by: Tianjia Zhang <[email protected]>
---
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.
policydigest= digest for the authorization policy. must be calculated
with the same hash algorithm as specified by the 'hash='
option.
diff --git a/crypto/hash_info.c b/crypto/hash_info.c
index a49ff96bde77..fe0119407219 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",
+ [HASH_ALGO_SM3] = "sm3",
[HASH_ALGO_STREEBOG_256] = "streebog256",
[HASH_ALGO_STREEBOG_512] = "streebog512",
};
@@ -50,7 +50,7 @@ const int hash_digest_size[HASH_ALGO__LAST] = {
[HASH_ALGO_TGR_128] = TGR128_DIGEST_SIZE,
[HASH_ALGO_TGR_160] = TGR160_DIGEST_SIZE,
[HASH_ALGO_TGR_192] = TGR192_DIGEST_SIZE,
- [HASH_ALGO_SM3_256] = SM3256_DIGEST_SIZE,
+ [HASH_ALGO_SM3] = SM3_DIGEST_SIZE,
[HASH_ALGO_STREEBOG_256] = STREEBOG256_DIGEST_SIZE,
[HASH_ALGO_STREEBOG_512] = STREEBOG512_DIGEST_SIZE,
};
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index a25815a6f625..20f55de9d87b 100644
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -19,7 +19,7 @@ static struct tpm2_hash tpm2_hash_map[] = {
{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},
+ {HASH_ALGO_SM3, TPM_ALG_SM3_256},
};

int tpm2_get_timeouts(struct tpm_chip *chip)
diff --git a/include/crypto/hash_info.h b/include/crypto/hash_info.h
index dd4f06785049..c1e6b2884732 100644
--- a/include/crypto/hash_info.h
+++ b/include/crypto/hash_info.h
@@ -32,7 +32,7 @@
#define TGR192_DIGEST_SIZE 24

/* not defined in include/crypto/ */
-#define SM3256_DIGEST_SIZE 32
+#define SM3_DIGEST_SIZE 32

extern const char *const hash_algo_name[HASH_ALGO__LAST];
extern const int hash_digest_size[HASH_ALGO__LAST];
diff --git a/include/uapi/linux/hash_info.h b/include/uapi/linux/hash_info.h
index 74a8609fcb4d..3829279b2d37 100644
--- a/include/uapi/linux/hash_info.h
+++ b/include/uapi/linux/hash_info.h
@@ -32,7 +32,8 @@ enum hash_algo {
HASH_ALGO_TGR_128,
HASH_ALGO_TGR_160,
HASH_ALGO_TGR_192,
- HASH_ALGO_SM3_256,
+ HASH_ALGO_SM3,
+ HASH_ALGO_SM3_256 = HASH_ALGO_SM3,
HASH_ALGO_STREEBOG_256,
HASH_ALGO_STREEBOG_512,
HASH_ALGO__LAST
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
index 0165da386289..52a696035176 100644
--- a/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@ -23,7 +23,7 @@ static struct tpm2_hash tpm2_hash_map[] = {
{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},
+ {HASH_ALGO_SM3, TPM_ALG_SM3_256},
};

static u32 tpm2key_oid[] = { 2, 23, 133, 10, 1, 5 };
--
2.19.1.3.ge56e4f7

2021-10-23 00:49:00

by Jarkko Sakkinen

Subject: Re: [PATCH v2 1/2] crypto: use SM3 instead of SM3_256

On Tue, 2021-10-19 at 18:04 +0800, Tianjia Zhang wrote:
> 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 <[email protected]>
> Signed-off-by: Tianjia Zhang <[email protected]>
> ---
>  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.

/Jarkko

2021-10-25 03:05:56

by Tianjia Zhang

Subject: Re: [PATCH v2 1/2] crypto: use SM3 instead of SM3_256

Hi Jarkko,

On 10/23/21 8:48 AM, Jarkko Sakkinen wrote:
> On Tue, 2021-10-19 at 18:04 +0800, Tianjia Zhang wrote:
>> 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 <[email protected]>
>> Signed-off-by: Tianjia Zhang <[email protected]>
>> ---
>>  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