lkml.org 
[lkml]   [2019]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/9] crypto: chelsio - Rename arrays to avoid conflict with crypto/sha256.h
    Date
    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>
    ---
    drivers/crypto/chelsio/chcr_algo.h | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/crypto/chelsio/chcr_algo.h b/drivers/crypto/chelsio/chcr_algo.h
    index ee20dd899e83..d1e6b51df0ce 100644
    --- a/drivers/crypto/chelsio/chcr_algo.h
    +++ b/drivers/crypto/chelsio/chcr_algo.h
    @@ -333,26 +333,26 @@ struct phys_sge_pairs {
    };


    -static const u32 sha1_init[SHA1_DIGEST_SIZE / 4] = {
    +static const u32 chcr_sha1_init[SHA1_DIGEST_SIZE / 4] = {
    SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4,
    };

    -static const u32 sha224_init[SHA256_DIGEST_SIZE / 4] = {
    +static const u32 chcr_sha224_init[SHA256_DIGEST_SIZE / 4] = {
    SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3,
    SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7,
    };

    -static const u32 sha256_init[SHA256_DIGEST_SIZE / 4] = {
    +static const u32 chcr_sha256_init[SHA256_DIGEST_SIZE / 4] = {
    SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,
    SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7,
    };

    -static const u64 sha384_init[SHA512_DIGEST_SIZE / 8] = {
    +static const u64 chcr_sha384_init[SHA512_DIGEST_SIZE / 8] = {
    SHA384_H0, SHA384_H1, SHA384_H2, SHA384_H3,
    SHA384_H4, SHA384_H5, SHA384_H6, SHA384_H7,
    };

    -static const u64 sha512_init[SHA512_DIGEST_SIZE / 8] = {
    +static const u64 chcr_sha512_init[SHA512_DIGEST_SIZE / 8] = {
    SHA512_H0, SHA512_H1, SHA512_H2, SHA512_H3,
    SHA512_H4, SHA512_H5, SHA512_H6, SHA512_H7,
    };
    @@ -362,21 +362,21 @@ static inline void copy_hash_init_values(char *key, int digestsize)
    u8 i;
    __be32 *dkey = (__be32 *)key;
    u64 *ldkey = (u64 *)key;
    - __be64 *sha384 = (__be64 *)sha384_init;
    - __be64 *sha512 = (__be64 *)sha512_init;
    + __be64 *sha384 = (__be64 *)chcr_sha384_init;
    + __be64 *sha512 = (__be64 *)chcr_sha512_init;

    switch (digestsize) {
    case SHA1_DIGEST_SIZE:
    for (i = 0; i < SHA1_INIT_STATE; i++)
    - dkey[i] = cpu_to_be32(sha1_init[i]);
    + dkey[i] = cpu_to_be32(chcr_sha1_init[i]);
    break;
    case SHA224_DIGEST_SIZE:
    for (i = 0; i < SHA224_INIT_STATE; i++)
    - dkey[i] = cpu_to_be32(sha224_init[i]);
    + dkey[i] = cpu_to_be32(chcr_sha224_init[i]);
    break;
    case SHA256_DIGEST_SIZE:
    for (i = 0; i < SHA256_INIT_STATE; i++)
    - dkey[i] = cpu_to_be32(sha256_init[i]);
    + dkey[i] = cpu_to_be32(chcr_sha256_init[i]);
    break;
    case SHA384_DIGEST_SIZE:
    for (i = 0; i < SHA384_INIT_STATE; i++)
    --
    2.23.0
    \
     
     \ /
      Last update: 2019-09-01 22:37    [W:2.920 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site