Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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/9990


Reviewed-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

drivers/staging/lustre/include/linux/libcfs/libcfs_crypto.h

+7 −2
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ enum cfs_crypto_hash_alg { 
	CFS_HASH_ALG_SHA384,

	CFS_HASH_ALG_SHA512,

	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[] = {
@@ -59,8 +60,12 @@ static struct cfs_crypto_hash_type hash_types[] = { 
	[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 },

};



/* Maximum size of hash_types[].cht_size */

#define CFS_CRYPTO_HASH_DIGESTSIZE_MAX	64



/**

 * Return hash algorithm information for the specified algorithm identifier

 *
@@ -131,7 +136,7 @@ static inline unsigned char cfs_crypto_hash_alg(const char *algname) 
	for (i = 0; i < CFS_HASH_ALG_MAX; i++)

		if (!strcmp(hash_types[i].cht_name, algname))

			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,

drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ static void cfs_crypto_performance_test(unsigned char hash_alg, 
	unsigned long		   start, end;

	int			     bcount, err = 0;

	int			     sec = 1; /* do test only 1 sec */

	unsigned char		   hash[64];

	unsigned int		    hash_len = 64;

	unsigned char hash[CFS_CRYPTO_HASH_DIGESTSIZE_MAX];

	unsigned int hash_len = sizeof(hash);



	for (start = jiffies, end = start + sec * HZ, bcount = 0;

	     time_before(jiffies, end); bcount++) {