crypto: FIPS 202 SHA-3 register in hash info for IMA

Register FIPS 202 SHA-3 hashes in hash info for IMA and other
users. Sizes 256 and up, as 224 is too weak for any practical
purposes.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/hash_info.c b/crypto/hash_info.c
index a49ff96..9a46763 100644 (file)
--- a/crypto/hash_info.c
+++ b/crypto/hash_info.c
@@ -29,6 +29,9 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = {
        [HASH_ALGO_SM3_256]     = "sm3",
        [HASH_ALGO_STREEBOG_256] = "streebog256",
        [HASH_ALGO_STREEBOG_512] = "streebog512",
+       [HASH_ALGO_SHA3_256]    = "sha3-256",
+       [HASH_ALGO_SHA3_384]    = "sha3-384",
+       [HASH_ALGO_SHA3_512]    = "sha3-512",
 };
 EXPORT_SYMBOL_GPL(hash_algo_name);
 
@@ -53,5 +56,8 @@ const int hash_digest_size[HASH_ALGO__LAST] = {
        [HASH_ALGO_SM3_256]     = SM3256_DIGEST_SIZE,
        [HASH_ALGO_STREEBOG_256] = STREEBOG256_DIGEST_SIZE,
        [HASH_ALGO_STREEBOG_512] = STREEBOG512_DIGEST_SIZE,
+       [HASH_ALGO_SHA3_256]    = SHA3_256_DIGEST_SIZE,
+       [HASH_ALGO_SHA3_384]    = SHA3_384_DIGEST_SIZE,
+       [HASH_ALGO_SHA3_512]    = SHA3_512_DIGEST_SIZE,
 };
 EXPORT_SYMBOL_GPL(hash_digest_size);

diff --git a/include/crypto/hash_info.h b/include/crypto/hash_info.h
index dd4f067..d692773 100644 (file)
--- a/include/crypto/hash_info.h
+++ b/include/crypto/hash_info.h
@@ -10,6 +10,7 @@
 
 #include <crypto/sha1.h>
 #include <crypto/sha2.h>
+#include <crypto/sha3.h>
 #include <crypto/md5.h>
 #include <crypto/streebog.h>
 

diff --git a/include/uapi/linux/hash_info.h b/include/uapi/linux/hash_info.h
index 74a8609..0af23ec 100644 (file)
--- a/include/uapi/linux/hash_info.h
+++ b/include/uapi/linux/hash_info.h
@@ -35,6 +35,9 @@ enum hash_algo {
        HASH_ALGO_SM3_256,
        HASH_ALGO_STREEBOG_256,
        HASH_ALGO_STREEBOG_512,
+       HASH_ALGO_SHA3_256,
+       HASH_ALGO_SHA3_384,
+       HASH_ALGO_SHA3_512,
        HASH_ALGO__LAST
 };