All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luis Henriques <luis.henriques@canonical.com>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: stable@vger.kernel.org, Jonas Meurer <jonas@freesources.org>
Subject: Re: [PATCH 3.16] crypto: {blk,giv}cipher: Set has_setkey
Date: Mon, 7 Mar 2016 10:20:23 +0000	[thread overview]
Message-ID: <20160307102023.GB3081@ares> (raw)
In-Reply-To: <20160307034002.GA21187@decadent.org.uk>

On Mon, Mar 07, 2016 at 03:40:02AM +0000, Ben Hutchings wrote:
> Commit a1383cd86a06 ("crypto: skcipher - Add crypto_skcipher_has_setkey")
> was incorrectly backported to the 3.2.y and 3.16.y stable branches.
> We need to set ablkcipher_tfm::has_setkey in the
> crypto_init_blkcipher_ops_async() and crypto_init_givcipher_ops()
> functions as well as crypto_init_ablkcipher_ops().
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> --- a/crypto/ablkcipher.c
> +++ b/crypto/ablkcipher.c
> @@ -457,6 +457,7 @@ static int crypto_init_givcipher_ops(str
>  	crt->givdecrypt = alg->givdecrypt ?: no_givdecrypt;
>  	crt->base = __crypto_ablkcipher_cast(tfm);
>  	crt->ivsize = alg->ivsize;
> +	crt->has_setkey = alg->max_keysize;
>  
>  	return 0;
>  }
> --- a/crypto/blkcipher.c
> +++ b/crypto/blkcipher.c
> @@ -471,6 +471,7 @@ static int crypto_init_blkcipher_ops_asy
>  	}
>  	crt->base = __crypto_ablkcipher_cast(tfm);
>  	crt->ivsize = alg->ivsize;
> +	crt->has_setkey = alg->max_keysize;
>  
>  	return 0;
>  }

Thanks Ben, queuing it for the 3.16 kernel.

Cheers,
--
Lu�s

      reply	other threads:[~2016-03-07 10:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-07  3:40 [PATCH 3.16] crypto: {blk,giv}cipher: Set has_setkey Ben Hutchings
2016-03-07 10:20 ` Luis Henriques [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160307102023.GB3081@ares \
    --to=luis.henriques@canonical.com \
    --cc=ben@decadent.org.uk \
    --cc=jonas@freesources.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.