From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41504 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809AbcCGDkF (ORCPT ); Sun, 6 Mar 2016 22:40:05 -0500 Date: Mon, 7 Mar 2016 03:40:02 +0000 From: Ben Hutchings To: Luis Henriques Cc: stable@vger.kernel.org, Jonas Meurer Message-ID: <20160307034002.GA21187@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline Subject: [PATCH 3.16] crypto: {blk,giv}cipher: Set has_setkey Sender: stable-owner@vger.kernel.org List-ID: --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 =3D alg->givdecrypt ?: no_givdecrypt; crt->base =3D __crypto_ablkcipher_cast(tfm); crt->ivsize =3D alg->ivsize; + crt->has_setkey =3D alg->max_keysize; =20 return 0; } --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -471,6 +471,7 @@ static int crypto_init_blkcipher_ops_asy } crt->base =3D __crypto_ablkcipher_cast(tfm); crt->ivsize =3D alg->ivsize; + crt->has_setkey =3D alg->max_keysize; =20 return 0; } --5mCyUwZo2JvN/JJP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVtz4Eue/yOyVhhEJAQrvTA//USyuz47yXj3qp28tUuYfXn7M2OLE3SML rHsPyAhNkurp160lFnUB9cGQUnlKsA2toJoz0tkoFchiyfv9Y5+quNZjtvvowG3t 3xZJ78jOHQHUsoJqEodh+Aim4iGhWDFZprnfdhoZy3hi4eJyj9+60NkqfinKqyfx uPYMTqiKY23kS3HmFB9SP8lC4d64wgOBvhWhltndL/xRBv76WVTj1fg7xMFZbbxr xzBmOOdb+k4lSjjOJBnJMY7SEMzlaAVGldz9nJNX6sIAmfIun+OkvmilUp4zrsfl YQw1vShU0k4lBO14B0+nWjgPTUE/wznip1GNqsq1yrzWKk7oNDUNBkhbJaNHZU4a 1yJ3scY/x8whAGIfjlwLvjMjk+eIgsmotWtNko2DoA77cxjhRoHU7B+8CWl1x8s+ NZWxluYhT8PVtTRba5lg1U07WfOlms4xUaaSzk+WFK+tkEKxWuY8y1TYekLLTZrF 52dvjYxkS/k197XplGlLbAsCwMXNYucFcHD+Dc4xVWihVjFatwPaoQQJ83F9PxpK qd9dPR8VXw9YGSunAsUPOwwQkPX6M63KZ66lhWdDLQ+WFW80RgryZzqRpCSaOaLX 4uodhW3kOwEuMzxRSSoeXrOvrCt4/lIhKM14mDXxs7ar9och9LZwvGZ6Pm05Y3Av 79fTOutjMUY= =ntE7 -----END PGP SIGNATURE----- --5mCyUwZo2JvN/JJP--