* [PATCH v2 0/2] use SM3 instead of SM3_256
@ 2021-10-19 10:04 Tianjia Zhang
2021-10-19 10:04 ` [PATCH v2 1/2] crypto: " Tianjia Zhang
2021-10-19 10:04 ` [PATCH v2 2/2] tpm: " Tianjia Zhang
0 siblings, 2 replies; 5+ messages in thread
From: Tianjia Zhang @ 2021-10-19 10:04 UTC (permalink / raw)
To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, Jonathan Corbet,
Herbert Xu, David S. Miller, Peter Huewe, Jason Gunthorpe,
David Howells, James Morris, Serge E. Hallyn, Jerry Snitselaar,
linux-integrity, keyrings, linux-doc, linux-kernel, linux-crypto,
linux-security-module
Cc: Tianjia Zhang
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.
---
v2 changes:
- an additional macro with the same value is defined for uapi instead
of renaming directly
Tianjia Zhang (2):
crypto: use SM3 instead of SM3_256
tpm: use SM3 instead of SM3_256
Documentation/security/keys/trusted-encrypted.rst | 2 +-
crypto/hash_info.c | 4 ++--
drivers/char/tpm/tpm-sysfs.c | 4 ++--
drivers/char/tpm/tpm2-cmd.c | 2 +-
include/crypto/hash_info.h | 2 +-
include/linux/tpm.h | 2 +-
include/uapi/linux/hash_info.h | 3 ++-
security/keys/trusted-keys/trusted_tpm2.c | 2 +-
8 files changed, 11 insertions(+), 10 deletions(-)
--
2.19.1.3.ge56e4f7
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] crypto: use SM3 instead of SM3_256
2021-10-19 10:04 [PATCH v2 0/2] use SM3 instead of SM3_256 Tianjia Zhang
@ 2021-10-19 10:04 ` Tianjia Zhang
2021-10-23 0:48 ` Jarkko Sakkinen
2021-10-19 10:04 ` [PATCH v2 2/2] tpm: " Tianjia Zhang
1 sibling, 1 reply; 5+ messages in thread
From: Tianjia Zhang @ 2021-10-19 10:04 UTC (permalink / raw)
To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, Jonathan Corbet,
Herbert Xu, David S. Miller, Peter Huewe, Jason Gunthorpe,
David Howells, James Morris, Serge E. Hallyn, Jerry Snitselaar,
linux-integrity, keyrings, linux-doc, linux-kernel, linux-crypto,
linux-security-module
Cc: Tianjia Zhang
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 <jejb@linux.ibm.com>
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] tpm: use SM3 instead of SM3_256
2021-10-19 10:04 [PATCH v2 0/2] use SM3 instead of SM3_256 Tianjia Zhang
2021-10-19 10:04 ` [PATCH v2 1/2] crypto: " Tianjia Zhang
@ 2021-10-19 10:04 ` Tianjia Zhang
1 sibling, 0 replies; 5+ messages in thread
From: Tianjia Zhang @ 2021-10-19 10:04 UTC (permalink / raw)
To: James Bottomley, Jarkko Sakkinen, Mimi Zohar, Jonathan Corbet,
Herbert Xu, David S. Miller, Peter Huewe, Jason Gunthorpe,
David Howells, James Morris, Serge E. Hallyn, Jerry Snitselaar,
linux-integrity, keyrings, linux-doc, linux-kernel, linux-crypto,
linux-security-module
Cc: Tianjia Zhang
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.
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
drivers/char/tpm/tpm-sysfs.c | 4 ++--
drivers/char/tpm/tpm2-cmd.c | 2 +-
include/linux/tpm.h | 2 +-
security/keys/trusted-keys/trusted_tpm2.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index 63f03cfb8e6a..fe6c785dc84a 100644
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -471,7 +471,7 @@ PCR_ATTR_BUILD(TPM_ALG_SHA1, sha1);
PCR_ATTR_BUILD(TPM_ALG_SHA256, sha256);
PCR_ATTR_BUILD(TPM_ALG_SHA384, sha384);
PCR_ATTR_BUILD(TPM_ALG_SHA512, sha512);
-PCR_ATTR_BUILD(TPM_ALG_SM3_256, sm3);
+PCR_ATTR_BUILD(TPM_ALG_SM3, sm3);
void tpm_sysfs_add_device(struct tpm_chip *chip)
@@ -500,7 +500,7 @@ void tpm_sysfs_add_device(struct tpm_chip *chip)
case TPM_ALG_SHA512:
chip->groups[chip->groups_cnt++] = &pcr_group_sha512;
break;
- case TPM_ALG_SM3_256:
+ case TPM_ALG_SM3:
chip->groups[chip->groups_cnt++] = &pcr_group_sm3;
break;
default:
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index 20f55de9d87b..d5a9410d2273 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, TPM_ALG_SM3_256},
+ {HASH_ALGO_SM3, TPM_ALG_SM3},
};
int tpm2_get_timeouts(struct tpm_chip *chip)
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index aa11fe323c56..56a79fee1250 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -40,7 +40,7 @@ enum tpm_algorithms {
TPM_ALG_SHA384 = 0x000C,
TPM_ALG_SHA512 = 0x000D,
TPM_ALG_NULL = 0x0010,
- TPM_ALG_SM3_256 = 0x0012,
+ TPM_ALG_SM3 = 0x0012,
};
/*
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
index 52a696035176..b15a9961213d 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, TPM_ALG_SM3_256},
+ {HASH_ALGO_SM3, TPM_ALG_SM3},
};
static u32 tpm2key_oid[] = { 2, 23, 133, 10, 1, 5 };
--
2.19.1.3.ge56e4f7
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] crypto: use SM3 instead of SM3_256
2021-10-19 10:04 ` [PATCH v2 1/2] crypto: " Tianjia Zhang
@ 2021-10-23 0:48 ` Jarkko Sakkinen
2021-10-25 3:04 ` Tianjia Zhang
0 siblings, 1 reply; 5+ messages in thread
From: Jarkko Sakkinen @ 2021-10-23 0:48 UTC (permalink / raw)
To: Tianjia Zhang, James Bottomley, Mimi Zohar, Jonathan Corbet,
Herbert Xu, David S. Miller, Peter Huewe, Jason Gunthorpe,
David Howells, James Morris, Serge E. Hallyn, Jerry Snitselaar,
linux-integrity, keyrings, linux-doc, linux-kernel, linux-crypto,
linux-security-module
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 <jejb@linux.ibm.com>
> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] crypto: use SM3 instead of SM3_256
2021-10-23 0:48 ` Jarkko Sakkinen
@ 2021-10-25 3:04 ` Tianjia Zhang
0 siblings, 0 replies; 5+ messages in thread
From: Tianjia Zhang @ 2021-10-25 3:04 UTC (permalink / raw)
To: Jarkko Sakkinen, James Bottomley, Mimi Zohar, Jonathan Corbet,
Herbert Xu, David S. Miller, Peter Huewe, Jason Gunthorpe,
David Howells, James Morris, Serge E. Hallyn, Jerry Snitselaar,
linux-integrity, keyrings, linux-doc, linux-kernel, linux-crypto,
linux-security-module
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 <jejb@linux.ibm.com>
>> Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
>> ---
>> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-10-25 3:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-19 10:04 [PATCH v2 0/2] use SM3 instead of SM3_256 Tianjia Zhang
2021-10-19 10:04 ` [PATCH v2 1/2] crypto: " Tianjia Zhang
2021-10-23 0:48 ` Jarkko Sakkinen
2021-10-25 3:04 ` Tianjia Zhang
2021-10-19 10:04 ` [PATCH v2 2/2] tpm: " Tianjia Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).