diff options
author | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
commit | 7ff17fe228094bad025c79c39e9e23af4364644c (patch) | |
tree | 05dc0dd252df9b5e3ed8e4429dc5f31c070e0f23 /crypto/hash_info.c | |
parent | 7271e588c712517a184f75744b6e94d05c8251a4 (diff) | |
parent | 9b882a6a998381cc1ea34edef55b8a6315114b7b (diff) | |
download | linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.tar.gz linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.zip |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to '')
-rw-r--r-- | crypto/hash_info.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/hash_info.c b/crypto/hash_info.c index 7b1e0b18..1dd095e4 100644 --- a/crypto/hash_info.c +++ b/crypto/hash_info.c @@ -32,6 +32,8 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = { [HASH_ALGO_TGR_160] = "tgr160", [HASH_ALGO_TGR_192] = "tgr192", [HASH_ALGO_SM3_256] = "sm3-256", + [HASH_ALGO_STREEBOG_256] = "streebog256", + [HASH_ALGO_STREEBOG_512] = "streebog512", }; EXPORT_SYMBOL_GPL(hash_algo_name); @@ -54,5 +56,7 @@ const int hash_digest_size[HASH_ALGO__LAST] = { [HASH_ALGO_TGR_160] = TGR160_DIGEST_SIZE, [HASH_ALGO_TGR_192] = TGR192_DIGEST_SIZE, [HASH_ALGO_SM3_256] = SM3256_DIGEST_SIZE, + [HASH_ALGO_STREEBOG_256] = STREEBOG256_DIGEST_SIZE, + [HASH_ALGO_STREEBOG_512] = STREEBOG512_DIGEST_SIZE, }; EXPORT_SYMBOL_GPL(hash_digest_size); |