Commit 24a4e1ec authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman

staging: lustre: libcfs: add new definitions for cfs_crypto api

Add CFS_HASH_ALG_UNKOWN for unknown hash names instead of
using "0xFF" directly. Define the max digestsize the cfs
crypto api can handle.
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5053
Reviewed-on: http://review.whamcloud.com/9990Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@gmail.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d60ffa1
...@@ -46,7 +46,8 @@ enum cfs_crypto_hash_alg { ...@@ -46,7 +46,8 @@ enum cfs_crypto_hash_alg {
CFS_HASH_ALG_SHA384, CFS_HASH_ALG_SHA384,
CFS_HASH_ALG_SHA512, CFS_HASH_ALG_SHA512,
CFS_HASH_ALG_CRC32C, CFS_HASH_ALG_CRC32C,
CFS_HASH_ALG_MAX CFS_HASH_ALG_MAX,
CFS_HASH_ALG_UNKNOWN = 0xff
}; };
static struct cfs_crypto_hash_type hash_types[] = { static struct cfs_crypto_hash_type hash_types[] = {
...@@ -59,8 +60,12 @@ static struct cfs_crypto_hash_type hash_types[] = { ...@@ -59,8 +60,12 @@ static struct cfs_crypto_hash_type hash_types[] = {
[CFS_HASH_ALG_SHA256] = { "sha256", 0, 32 }, [CFS_HASH_ALG_SHA256] = { "sha256", 0, 32 },
[CFS_HASH_ALG_SHA384] = { "sha384", 0, 48 }, [CFS_HASH_ALG_SHA384] = { "sha384", 0, 48 },
[CFS_HASH_ALG_SHA512] = { "sha512", 0, 64 }, [CFS_HASH_ALG_SHA512] = { "sha512", 0, 64 },
[CFS_HASH_ALG_MAX] = { NULL, 0, 64 },
}; };
/* Maximum size of hash_types[].cht_size */
#define CFS_CRYPTO_HASH_DIGESTSIZE_MAX 64
/** /**
* Return hash algorithm information for the specified algorithm identifier * Return hash algorithm information for the specified algorithm identifier
* *
...@@ -131,7 +136,7 @@ static inline unsigned char cfs_crypto_hash_alg(const char *algname) ...@@ -131,7 +136,7 @@ static inline unsigned char cfs_crypto_hash_alg(const char *algname)
for (i = 0; i < CFS_HASH_ALG_MAX; i++) for (i = 0; i < CFS_HASH_ALG_MAX; i++)
if (!strcmp(hash_types[i].cht_name, algname)) if (!strcmp(hash_types[i].cht_name, algname))
break; break;
return (i == CFS_HASH_ALG_MAX ? 0xFF : i); return (i == CFS_HASH_ALG_MAX ? CFS_HASH_ALG_UNKNOWN : i);
} }
int cfs_crypto_hash_digest(unsigned char hash_alg, int cfs_crypto_hash_digest(unsigned char hash_alg,
......
...@@ -316,8 +316,8 @@ static void cfs_crypto_performance_test(unsigned char hash_alg, ...@@ -316,8 +316,8 @@ static void cfs_crypto_performance_test(unsigned char hash_alg,
unsigned long start, end; unsigned long start, end;
int bcount, err = 0; int bcount, err = 0;
int sec = 1; /* do test only 1 sec */ int sec = 1; /* do test only 1 sec */
unsigned char hash[64]; unsigned char hash[CFS_CRYPTO_HASH_DIGESTSIZE_MAX];
unsigned int hash_len = 64; unsigned int hash_len = sizeof(hash);
for (start = jiffies, end = start + sec * HZ, bcount = 0; for (start = jiffies, end = start + sec * HZ, bcount = 0;
time_before(jiffies, end); bcount++) { time_before(jiffies, end); bcount++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment