summaryrefslogtreecommitdiffstats
path: root/crypto/hash_info.c
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2015-11-05 14:43:06 -0500
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2015-12-20 08:27:12 -0500
commit5ca4c20cfd37bac6486de040e9951b3b34755238 (patch)
tree1ee427b120ae979e1cd30b7bc47c31426066deae /crypto/hash_info.c
parent5208cc83423dde06924121a85368c721a27ca555 (diff)
keys, trusted: select hash algorithm for TPM2 chips
Added 'hash=' option for selecting the hash algorithm for add_key() syscall and documentation for it. Added entry for sm3-256 to the following tables in order to support TPM_ALG_SM3_256: * hash_algo_name * hash_digest_size Includes support for the following hash algorithms: * sha1 * sha256 * sha384 * sha512 * sm3-256 Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: James Morris <james.l.morris@oracle.com> Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Acked-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'crypto/hash_info.c')
-rw-r--r--crypto/hash_info.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/hash_info.c b/crypto/hash_info.c
index 3e7ff46f26e8..7b1e0b188ce6 100644
--- a/crypto/hash_info.c
+++ b/crypto/hash_info.c
@@ -31,6 +31,7 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = {
31 [HASH_ALGO_TGR_128] = "tgr128", 31 [HASH_ALGO_TGR_128] = "tgr128",
32 [HASH_ALGO_TGR_160] = "tgr160", 32 [HASH_ALGO_TGR_160] = "tgr160",
33 [HASH_ALGO_TGR_192] = "tgr192", 33 [HASH_ALGO_TGR_192] = "tgr192",
34 [HASH_ALGO_SM3_256] = "sm3-256",
34}; 35};
35EXPORT_SYMBOL_GPL(hash_algo_name); 36EXPORT_SYMBOL_GPL(hash_algo_name);
36 37
@@ -52,5 +53,6 @@ const int hash_digest_size[HASH_ALGO__LAST] = {
52 [HASH_ALGO_TGR_128] = TGR128_DIGEST_SIZE, 53 [HASH_ALGO_TGR_128] = TGR128_DIGEST_SIZE,
53 [HASH_ALGO_TGR_160] = TGR160_DIGEST_SIZE, 54 [HASH_ALGO_TGR_160] = TGR160_DIGEST_SIZE,
54 [HASH_ALGO_TGR_192] = TGR192_DIGEST_SIZE, 55 [HASH_ALGO_TGR_192] = TGR192_DIGEST_SIZE,
56 [HASH_ALGO_SM3_256] = SM3256_DIGEST_SIZE,
55}; 57};
56EXPORT_SYMBOL_GPL(hash_digest_size); 58EXPORT_SYMBOL_GPL(hash_digest_size);