Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

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>

authored by

Hans de Goede and committed by
Herbert Xu
6e4655e2 e55d8a75

+10 -10
+10 -10
drivers/crypto/chelsio/chcr_algo.h
··· 333 333 }; 334 334 335 335 336 - static const u32 sha1_init[SHA1_DIGEST_SIZE / 4] = { 336 + static const u32 chcr_sha1_init[SHA1_DIGEST_SIZE / 4] = { 337 337 SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4, 338 338 }; 339 339 340 - static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = { 340 + static const u32 chcr_sha224_init[SHA256_DIGEST_SIZE / 4] = { 341 341 SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3, 342 342 SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7, 343 343 }; 344 344 345 - static const u32 sha256_init[SHA256_DIGEST_SIZE / 4] = { 345 + static const u32 chcr_sha256_init[SHA256_DIGEST_SIZE / 4] = { 346 346 SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3, 347 347 SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7, 348 348 }; 349 349 350 - static const u64 sha384_init[SHA512_DIGEST_SIZE / 8] = { 350 + static const u64 chcr_sha384_init[SHA512_DIGEST_SIZE / 8] = { 351 351 SHA384_H0, SHA384_H1, SHA384_H2, SHA384_H3, 352 352 SHA384_H4, SHA384_H5, SHA384_H6, SHA384_H7, 353 353 }; 354 354 355 - static const u64 sha512_init[SHA512_DIGEST_SIZE / 8] = { 355 + static const u64 chcr_sha512_init[SHA512_DIGEST_SIZE / 8] = { 356 356 SHA512_H0, SHA512_H1, SHA512_H2, SHA512_H3, 357 357 SHA512_H4, SHA512_H5, SHA512_H6, SHA512_H7, 358 358 }; ··· 362 362 u8 i; 363 363 __be32 *dkey = (__be32 *)key; 364 364 u64 *ldkey = (u64 *)key; 365 - __be64 *sha384 = (__be64 *)sha384_init; 366 - __be64 *sha512 = (__be64 *)sha512_init; 365 + __be64 *sha384 = (__be64 *)chcr_sha384_init; 366 + __be64 *sha512 = (__be64 *)chcr_sha512_init; 367 367 368 368 switch (digestsize) { 369 369 case SHA1_DIGEST_SIZE: 370 370 for (i = 0; i < SHA1_INIT_STATE; i++) 371 - dkey[i] = cpu_to_be32(sha1_init[i]); 371 + dkey[i] = cpu_to_be32(chcr_sha1_init[i]); 372 372 break; 373 373 case SHA224_DIGEST_SIZE: 374 374 for (i = 0; i < SHA224_INIT_STATE; i++) 375 - dkey[i] = cpu_to_be32(sha224_init[i]); 375 + dkey[i] = cpu_to_be32(chcr_sha224_init[i]); 376 376 break; 377 377 case SHA256_DIGEST_SIZE: 378 378 for (i = 0; i < SHA256_INIT_STATE; i++) 379 - dkey[i] = cpu_to_be32(sha256_init[i]); 379 + dkey[i] = cpu_to_be32(chcr_sha256_init[i]); 380 380 break; 381 381 case SHA384_DIGEST_SIZE: 382 382 for (i = 0; i < SHA384_INIT_STATE; i++)