diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
commit | 0d6e29d8da85e74c1b37801469be3974fd706ba7 (patch) | |
tree | 0a5824f6fef63ea2be36406768e8cfe3e6c2457e /crypto/hash_info.c | |
parent | 2db18d12ffa4131d398564bfc0fb15f26cdf52e5 (diff) | |
parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
download | linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.tar.gz linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.zip |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'crypto/hash_info.c')
-rw-r--r-- | crypto/hash_info.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/hash_info.c b/crypto/hash_info.c index 3e7ff46f..7b1e0b18 100644 --- a/crypto/hash_info.c +++ b/crypto/hash_info.c @@ -31,6 +31,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-256", }; EXPORT_SYMBOL_GPL(hash_algo_name); @@ -52,5 +53,6 @@ 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, }; EXPORT_SYMBOL_GPL(hash_digest_size); |