fs-verity: add SHA-512 support

Add SHA-512 support to fs-verity.  This is primarily a demonstration of
the trivial changes needed to support a new hash algorithm in fs-verity;
most users will still use SHA-256, due to the smaller space required to
store the hashes.  But some users may prefer SHA-512.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/fs/verity/fsverity_private.h b/fs/verity/fsverity_private.h
index eaa2b3b93bbf6b82957a39e55750b70085af6eeb..02a547f0667c13c74c159dd04cb45f83b84f05fc 100644 (file)
--- a/fs/verity/fsverity_private.h
+++ b/fs/verity/fsverity_private.h
@@ -29,7 +29,7 @@ struct ahash_request;
  * Largest digest size among all hash algorithms supported by fs-verity.
  * Currently assumed to be <= size of fsverity_descriptor::root_hash.
  */
-#define FS_VERITY_MAX_DIGEST_SIZE      SHA256_DIGEST_SIZE
+#define FS_VERITY_MAX_DIGEST_SIZE      SHA512_DIGEST_SIZE
 
 /* A hash algorithm supported by fs-verity */
 struct fsverity_hash_alg {

diff --git a/fs/verity/hash_algs.c b/fs/verity/hash_algs.c
index 7df1d67742b8479034b924ad3aa13f642ce1dee6..31e6d7d2389ab00a1a7d8a4b6bc4c3af03e21a85 100644 (file)
--- a/fs/verity/hash_algs.c
+++ b/fs/verity/hash_algs.c
@@ -17,6 +17,11 @@ struct fsverity_hash_alg fsverity_hash_algs[] = {
                .digest_size = SHA256_DIGEST_SIZE,
                .block_size = SHA256_BLOCK_SIZE,
        },
+       [FS_VERITY_HASH_ALG_SHA512] = {
+               .name = "sha512",
+               .digest_size = SHA512_DIGEST_SIZE,
+               .block_size = SHA512_BLOCK_SIZE,
+       },
 };
 
 /**

diff --git a/include/uapi/linux/fsverity.h b/include/uapi/linux/fsverity.h
index 57d1d7fc0c345a3b99395990c84c8eafd7c6f109..da0daf6c193b4bd7f0d0e700ad74f5e639ada116 100644 (file)
--- a/include/uapi/linux/fsverity.h
+++ b/include/uapi/linux/fsverity.h
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 
 #define FS_VERITY_HASH_ALG_SHA256      1
+#define FS_VERITY_HASH_ALG_SHA512      2
 
 struct fsverity_enable_arg {
        __u32 version;