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.9 32/88] crypto: cryptd - pass through absence of ->setkey()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Biggers <ebiggers@google.com>

    commit 841a3ff329713f796a63356fef6e2f72e4a3f6a3 upstream.

    When the cryptd template is used to wrap an unkeyed hash algorithm,
    don't install a ->setkey() method to the cryptd instance. This change
    is necessary for cryptd 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/cryptd.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/crypto/cryptd.c
    +++ b/crypto/cryptd.c
    @@ -691,7 +691,8 @@ static int cryptd_create_hash(struct cry
    inst->alg.finup = cryptd_hash_finup_enqueue;
    inst->alg.export = cryptd_hash_export;
    inst->alg.import = cryptd_hash_import;
    - inst->alg.setkey = cryptd_hash_setkey;
    + if (crypto_shash_alg_has_setkey(salg))
    + inst->alg.setkey = cryptd_hash_setkey;
    inst->alg.digest = cryptd_hash_digest_enqueue;

    err = ahash_register_instance(tmpl, inst);

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