Commit 527aa895 authored by Hans de Goede's avatar Hans de Goede Committed by Herbert Xu
Browse files

crypto: n2 - Rename arrays to avoid conflict with crypto/sha256.h 



Rename the sha*_init arrays to n2_sha*_init so that they do not conflict
with the functions declared in crypto/sha256.h.

Also rename md5_init to n2_md5_init for consistency.

This is a preparation patch for folding crypto/sha256.h into crypto/sha.h.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6e4655e2

drivers/crypto/n2_core.c

+8 −8
Original line number Diff line number Diff line
@@ -1283,20 +1283,20 @@ struct n2_hash_tmpl { 
	u8		hmac_type;

};



static const u32 md5_init[MD5_HASH_WORDS] = {

static const u32 n2_md5_init[MD5_HASH_WORDS] = {

	cpu_to_le32(MD5_H0),

	cpu_to_le32(MD5_H1),

	cpu_to_le32(MD5_H2),

	cpu_to_le32(MD5_H3),

};

static const u32 sha1_init[SHA1_DIGEST_SIZE / 4] = {

static const u32 n2_sha1_init[SHA1_DIGEST_SIZE / 4] = {

	SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4,

};

static const u32 sha256_init[SHA256_DIGEST_SIZE / 4] = {

static const u32 n2_sha256_init[SHA256_DIGEST_SIZE / 4] = {

	SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,

	SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7,

};

static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = {

static const u32 n2_sha224_init[SHA256_DIGEST_SIZE / 4] = {

	SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3,

	SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7,

};
@@ -1304,7 +1304,7 @@ static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = { 
static const struct n2_hash_tmpl hash_tmpls[] = {

	{ .name		= "md5",

	  .hash_zero	= md5_zero_message_hash,

	  .hash_init	= md5_init,

	  .hash_init	= n2_md5_init,

	  .auth_type	= AUTH_TYPE_MD5,

	  .hmac_type	= AUTH_TYPE_HMAC_MD5,

	  .hw_op_hashsz	= MD5_DIGEST_SIZE,
@@ -1312,7 +1312,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .block_size	= MD5_HMAC_BLOCK_SIZE },

	{ .name		= "sha1",

	  .hash_zero	= sha1_zero_message_hash,

	  .hash_init	= sha1_init,

	  .hash_init	= n2_sha1_init,

	  .auth_type	= AUTH_TYPE_SHA1,

	  .hmac_type	= AUTH_TYPE_HMAC_SHA1,

	  .hw_op_hashsz	= SHA1_DIGEST_SIZE,
@@ -1320,7 +1320,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .block_size	= SHA1_BLOCK_SIZE },

	{ .name		= "sha256",

	  .hash_zero	= sha256_zero_message_hash,

	  .hash_init	= sha256_init,

	  .hash_init	= n2_sha256_init,

	  .auth_type	= AUTH_TYPE_SHA256,

	  .hmac_type	= AUTH_TYPE_HMAC_SHA256,

	  .hw_op_hashsz	= SHA256_DIGEST_SIZE,
@@ -1328,7 +1328,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = { 
	  .block_size	= SHA256_BLOCK_SIZE },

	{ .name		= "sha224",

	  .hash_zero	= sha224_zero_message_hash,

	  .hash_init	= sha224_init,

	  .hash_init	= n2_sha224_init,

	  .auth_type	= AUTH_TYPE_SHA256,

	  .hmac_type	= AUTH_TYPE_RESERVED,

	  .hw_op_hashsz	= SHA256_DIGEST_SIZE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE