X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flibcfs_crypto.h;h=b44b8006c119cf1f1409ff8bad3e5d4c23796b76;hp=2d6897cec37f169b05b701760cd7a058c383ed73;hb=ef6bb2cd842d18e6fbe4f6160467a9318c1862e0;hpb=20c748658000f5454f38576af506643e370bb1bc

diff --git a/libcfs/include/libcfs/libcfs_crypto.h b/libcfs/include/libcfs/libcfs_crypto.h
index 2d6897c..b44b800 100644
--- a/libcfs/include/libcfs/libcfs_crypto.h
+++ b/libcfs/include/libcfs/libcfs_crypto.h
@@ -53,16 +53,56 @@ enum cfs_crypto_hash_alg {
 };
 
 static struct cfs_crypto_hash_type hash_types[] = {
-	[CFS_HASH_ALG_NULL]	= { "null",	 0,	 0 },
-	[CFS_HASH_ALG_ADLER32]	= { "adler32",	 1,	 4 },
-	[CFS_HASH_ALG_CRC32]	= { "crc32",	~0,	 4 },
-	[CFS_HASH_ALG_CRC32C]	= { "crc32c",	~0,	 4 },
-	[CFS_HASH_ALG_MD5]	= { "md5",	 0,	16 },
-	[CFS_HASH_ALG_SHA1]	= { "sha1",	 0,	20 },
-	[CFS_HASH_ALG_SHA256]	= { "sha256",	 0,	32 },
-	[CFS_HASH_ALG_SHA384]	= { "sha384",	 0,	48 },
-	[CFS_HASH_ALG_SHA512]	= { "sha512",	 0,	64 },
-	[CFS_HASH_ALG_MAX]	= { NULL,	 0,	64 },
+	[CFS_HASH_ALG_NULL] = {
+		.cht_name	= "null",
+		.cht_key	= 0,
+		.cht_size	= 0
+	},
+	[CFS_HASH_ALG_ADLER32] = {
+		.cht_name	= "adler32",
+		.cht_key	= 1,
+		.cht_size	= 4
+	},
+	[CFS_HASH_ALG_CRC32] = {
+		.cht_name	= "crc32",
+		.cht_key	= ~0,
+		.cht_size	= 4
+	},
+	[CFS_HASH_ALG_CRC32C] = {
+		.cht_name	= "crc32c",
+		.cht_key	= ~0,
+		.cht_size	= 4
+	},
+	[CFS_HASH_ALG_MD5] = {
+		.cht_name	= "md5",
+		.cht_key	= 0,
+		.cht_size	= 16
+	},
+	[CFS_HASH_ALG_SHA1] = {
+		.cht_name	= "sha1",
+		.cht_key	= 0,
+		.cht_size	= 20
+	},
+	[CFS_HASH_ALG_SHA256] = {
+		.cht_name	= "sha256",
+		.cht_key	= 0,
+		.cht_size	= 32
+	},
+	[CFS_HASH_ALG_SHA384] = {
+		.cht_name	= "sha384",
+		.cht_key	= 0,
+		.cht_size	= 48
+	},
+	[CFS_HASH_ALG_SHA512] = {
+		.cht_name	= "sha512",
+		.cht_key	= 0,
+		.cht_size	= 64
+	},
+	[CFS_HASH_ALG_MAX] = {
+		.cht_name	= NULL,
+		.cht_key	= 0,
+		.cht_size	= 64
+	}
 };
 
 /* Maximum size of hash_types[].cht_size */