From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com ([91.189.89.112]:58403 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbcCGKU1 (ORCPT ); Mon, 7 Mar 2016 05:20:27 -0500 Date: Mon, 7 Mar 2016 10:20:23 +0000 From: Luis Henriques To: Ben Hutchings Cc: stable@vger.kernel.org, Jonas Meurer Subject: Re: [PATCH 3.16] crypto: {blk,giv}cipher: Set has_setkey Message-ID: <20160307102023.GB3081@ares> References: <20160307034002.GA21187@decadent.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160307034002.GA21187@decadent.org.uk> Sender: stable-owner@vger.kernel.org List-ID: 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 > --- > --- 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