lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 017/163] crypto: x86/blake2s - define shash_alg structs using macros
    Date
    From: Eric Biggers <ebiggers@google.com>

    commit 1aa90f4cf034ed4f016a02330820ac0551a6c13c upstream.

    The shash_alg structs for the four variants of BLAKE2s are identical
    except for the algorithm name, driver name, and digest size. So, avoid
    code duplication by using a macro to define these structs.

    Acked-by: Ard Biesheuvel <ardb@kernel.org>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/crypto/blake2s-glue.c | 84 +++++++++++------------------------------
    1 file changed, 23 insertions(+), 61 deletions(-)

    --- a/arch/x86/crypto/blake2s-glue.c
    +++ b/arch/x86/crypto/blake2s-glue.c
    @@ -129,67 +129,29 @@ static int crypto_blake2s_final(struct s
    return 0;
    }

    -static struct shash_alg blake2s_algs[] = {{
    - .base.cra_name = "blake2s-128",
    - .base.cra_driver_name = "blake2s-128-x86",
    - .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
    - .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx),
    - .base.cra_priority = 200,
    - .base.cra_blocksize = BLAKE2S_BLOCK_SIZE,
    - .base.cra_module = THIS_MODULE,
    -
    - .digestsize = BLAKE2S_128_HASH_SIZE,
    - .setkey = crypto_blake2s_setkey,
    - .init = crypto_blake2s_init,
    - .update = crypto_blake2s_update,
    - .final = crypto_blake2s_final,
    - .descsize = sizeof(struct blake2s_state),
    -}, {
    - .base.cra_name = "blake2s-160",
    - .base.cra_driver_name = "blake2s-160-x86",
    - .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
    - .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx),
    - .base.cra_priority = 200,
    - .base.cra_blocksize = BLAKE2S_BLOCK_SIZE,
    - .base.cra_module = THIS_MODULE,
    -
    - .digestsize = BLAKE2S_160_HASH_SIZE,
    - .setkey = crypto_blake2s_setkey,
    - .init = crypto_blake2s_init,
    - .update = crypto_blake2s_update,
    - .final = crypto_blake2s_final,
    - .descsize = sizeof(struct blake2s_state),
    -}, {
    - .base.cra_name = "blake2s-224",
    - .base.cra_driver_name = "blake2s-224-x86",
    - .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
    - .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx),
    - .base.cra_priority = 200,
    - .base.cra_blocksize = BLAKE2S_BLOCK_SIZE,
    - .base.cra_module = THIS_MODULE,
    -
    - .digestsize = BLAKE2S_224_HASH_SIZE,
    - .setkey = crypto_blake2s_setkey,
    - .init = crypto_blake2s_init,
    - .update = crypto_blake2s_update,
    - .final = crypto_blake2s_final,
    - .descsize = sizeof(struct blake2s_state),
    -}, {
    - .base.cra_name = "blake2s-256",
    - .base.cra_driver_name = "blake2s-256-x86",
    - .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
    - .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx),
    - .base.cra_priority = 200,
    - .base.cra_blocksize = BLAKE2S_BLOCK_SIZE,
    - .base.cra_module = THIS_MODULE,
    -
    - .digestsize = BLAKE2S_256_HASH_SIZE,
    - .setkey = crypto_blake2s_setkey,
    - .init = crypto_blake2s_init,
    - .update = crypto_blake2s_update,
    - .final = crypto_blake2s_final,
    - .descsize = sizeof(struct blake2s_state),
    -}};
    +#define BLAKE2S_ALG(name, driver_name, digest_size) \
    + { \
    + .base.cra_name = name, \
    + .base.cra_driver_name = driver_name, \
    + .base.cra_priority = 200, \
    + .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY, \
    + .base.cra_blocksize = BLAKE2S_BLOCK_SIZE, \
    + .base.cra_ctxsize = sizeof(struct blake2s_tfm_ctx), \
    + .base.cra_module = THIS_MODULE, \
    + .digestsize = digest_size, \
    + .setkey = crypto_blake2s_setkey, \
    + .init = crypto_blake2s_init, \
    + .update = crypto_blake2s_update, \
    + .final = crypto_blake2s_final, \
    + .descsize = sizeof(struct blake2s_state), \
    + }
    +
    +static struct shash_alg blake2s_algs[] = {
    + BLAKE2S_ALG("blake2s-128", "blake2s-128-x86", BLAKE2S_128_HASH_SIZE),
    + BLAKE2S_ALG("blake2s-160", "blake2s-160-x86", BLAKE2S_160_HASH_SIZE),
    + BLAKE2S_ALG("blake2s-224", "blake2s-224-x86", BLAKE2S_224_HASH_SIZE),
    + BLAKE2S_ALG("blake2s-256", "blake2s-256-x86", BLAKE2S_256_HASH_SIZE),
    +};

    static int __init blake2s_mod_init(void)
    {

    \
     
     \ /
      Last update: 2022-05-27 13:39    [W:2.249 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site