lkml.org 
[lkml]   [2019]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 028/128] crypto: chacha20poly1305 - set cra_name correctly
    Date
    From: Eric Biggers <ebiggers@google.com>

    commit 5e27f38f1f3f45a0c938299c3a34a2d2db77165a upstream.

    If the rfc7539 template is instantiated with specific implementations,
    e.g. "rfc7539(chacha20-generic,poly1305-generic)" rather than
    "rfc7539(chacha20,poly1305)", then the implementation names end up
    included in the instance's cra_name. This is incorrect because it then
    prevents all users from allocating "rfc7539(chacha20,poly1305)", if the
    highest priority implementations of chacha20 and poly1305 were selected.
    Also, the self-tests aren't run on an instance allocated in this way.

    Fix it by setting the instance's cra_name from the underlying
    algorithms' actual cra_names, rather than from the requested names.
    This matches what other templates do.

    Fixes: 71ebc4d1b27d ("crypto: chacha20poly1305 - Add a ChaCha20-Poly1305 AEAD construction, RFC7539")
    Cc: <stable@vger.kernel.org> # v4.2+
    Cc: Martin Willi <martin@strongswan.org>
    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Reviewed-by: Martin Willi <martin@strongswan.org>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/chacha20poly1305.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/crypto/chacha20poly1305.c
    +++ b/crypto/chacha20poly1305.c
    @@ -645,8 +645,8 @@ static int chachapoly_create(struct cryp

    err = -ENAMETOOLONG;
    if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
    - "%s(%s,%s)", name, chacha_name,
    - poly_name) >= CRYPTO_MAX_ALG_NAME)
    + "%s(%s,%s)", name, chacha->base.cra_name,
    + poly->cra_name) >= CRYPTO_MAX_ALG_NAME)
    goto out_drop_chacha;
    if (snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,
    "%s(%s,%s)", name, chacha->base.cra_driver_name,

    \
     
     \ /
      Last update: 2019-05-20 15:09    [W:3.008 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site