UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Hans de Goede 2019-09-01 22:35:30 +02:00 committed by Herbert Xu
parent 6e4655e20d
commit 527aa8958f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/crypto/n2_core.c
View File

@ -1283,20 +1283,20 @@ struct n2_hash_tmpl {
u8 hmac_type; 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_H0),
cpu_to_le32(MD5_H1), cpu_to_le32(MD5_H1),
cpu_to_le32(MD5_H2), cpu_to_le32(MD5_H2),
cpu_to_le32(MD5_H3), 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, 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_H0, SHA256_H1, SHA256_H2, SHA256_H3,
SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7, 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_H0, SHA224_H1, SHA224_H2, SHA224_H3,
SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7, 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[] = { static const struct n2_hash_tmpl hash_tmpls[] = {
{ .name = "md5", { .name = "md5",
.hash_zero = md5_zero_message_hash, .hash_zero = md5_zero_message_hash,
.hash_init = md5_init, .hash_init = n2_md5_init,
.auth_type = AUTH_TYPE_MD5, .auth_type = AUTH_TYPE_MD5,
.hmac_type = AUTH_TYPE_HMAC_MD5, .hmac_type = AUTH_TYPE_HMAC_MD5,
.hw_op_hashsz = MD5_DIGEST_SIZE, .hw_op_hashsz = MD5_DIGEST_SIZE,
@ -1312,7 +1312,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = {
.block_size = MD5_HMAC_BLOCK_SIZE }, .block_size = MD5_HMAC_BLOCK_SIZE },
{ .name = "sha1", { .name = "sha1",
.hash_zero = sha1_zero_message_hash, .hash_zero = sha1_zero_message_hash,
.hash_init = sha1_init, .hash_init = n2_sha1_init,
.auth_type = AUTH_TYPE_SHA1, .auth_type = AUTH_TYPE_SHA1,
.hmac_type = AUTH_TYPE_HMAC_SHA1, .hmac_type = AUTH_TYPE_HMAC_SHA1,
.hw_op_hashsz = SHA1_DIGEST_SIZE, .hw_op_hashsz = SHA1_DIGEST_SIZE,
@ -1320,7 +1320,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = {
.block_size = SHA1_BLOCK_SIZE }, .block_size = SHA1_BLOCK_SIZE },
{ .name = "sha256", { .name = "sha256",
.hash_zero = sha256_zero_message_hash, .hash_zero = sha256_zero_message_hash,
.hash_init = sha256_init, .hash_init = n2_sha256_init,
.auth_type = AUTH_TYPE_SHA256, .auth_type = AUTH_TYPE_SHA256,
.hmac_type = AUTH_TYPE_HMAC_SHA256, .hmac_type = AUTH_TYPE_HMAC_SHA256,
.hw_op_hashsz = SHA256_DIGEST_SIZE, .hw_op_hashsz = SHA256_DIGEST_SIZE,
@ -1328,7 +1328,7 @@ static const struct n2_hash_tmpl hash_tmpls[] = {
.block_size = SHA256_BLOCK_SIZE }, .block_size = SHA256_BLOCK_SIZE },
{ .name = "sha224", { .name = "sha224",
.hash_zero = sha224_zero_message_hash, .hash_zero = sha224_zero_message_hash,
.hash_init = sha224_init, .hash_init = n2_sha224_init,
.auth_type = AUTH_TYPE_SHA256, .auth_type = AUTH_TYPE_SHA256,
.hmac_type = AUTH_TYPE_RESERVED, .hmac_type = AUTH_TYPE_RESERVED,
.hw_op_hashsz = SHA256_DIGEST_SIZE, .hw_op_hashsz = SHA256_DIGEST_SIZE,