lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 116/195] crypto: mcryptd - pass through absence of ->setkey()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Biggers <ebiggers@google.com>

    commit fa59b92d299f2787e6bae1ff078ee0982e80211f upstream.

    When the mcryptd template is used to wrap an unkeyed hash algorithm,
    don't install a ->setkey() method to the mcryptd instance. This change
    is necessary for mcryptd to keep working with unkeyed hash algorithms
    once we start enforcing that ->setkey() is called when present.

    Signed-off-by: Eric Biggers <ebiggers@google.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/mcryptd.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/crypto/mcryptd.c
    +++ b/crypto/mcryptd.c
    @@ -535,7 +535,8 @@ static int mcryptd_create_hash(struct cr
    inst->alg.finup = mcryptd_hash_finup_enqueue;
    inst->alg.export = mcryptd_hash_export;
    inst->alg.import = mcryptd_hash_import;
    - inst->alg.setkey = mcryptd_hash_setkey;
    + if (crypto_hash_alg_has_setkey(halg))
    + inst->alg.setkey = mcryptd_hash_setkey;
    inst->alg.digest = mcryptd_hash_digest_enqueue;

    err = ahash_register_instance(tmpl, inst);

    \
     
     \ /
      Last update: 2018-02-15 18:26    [W:4.589 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site