lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 019/196] crypto: shash - Fix has_key setting
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit 00420a65fa2beb3206090ead86942484df2275f3 upstream.

    The has_key logic is wrong for shash algorithms as they always
    have a setkey function. So we should instead be testing against
    shash_no_setkey.

    Fixes: a5596d633278 ("crypto: hash - Add crypto_ahash_has_setkey")
    Reported-by: Stephan Mueller <smueller@chronox.de>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Tested-by: Stephan Mueller <smueller@chronox.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    crypto/shash.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/crypto/shash.c b/crypto/shash.c
    index aa3e5050..03fbcd4 100644
    --- a/crypto/shash.c
    +++ b/crypto/shash.c
    @@ -354,11 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
    crt->final = shash_async_final;
    crt->finup = shash_async_finup;
    crt->digest = shash_async_digest;
    + crt->setkey = shash_async_setkey;
    +
    + crt->has_setkey = alg->setkey != shash_no_setkey;

    - if (alg->setkey) {
    - crt->setkey = shash_async_setkey;
    - crt->has_setkey = true;
    - }
    if (alg->export)
    crt->export = shash_async_export;
    if (alg->import)
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-09 02:21    [W:2.882 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site