[linux] 01/03: Add missing hunk of crypto ABI fix

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie
in repository linux.

commit b9a7ee359ed488235734398b16f46eadc794e1eb
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Mar 6 22:02:58 2016 +0000

    Add missing hunk of crypto ABI fix
---
 .../patches/debian/crypto-fix-abi-change-in-3.16.7-ckt25.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/patches/debian/crypto-fix-abi-change-in-3.16.7-ckt25.patch b/debian/patches/debian/crypto-fix-abi-change-in-3.16.7-ckt25.patch
index 0879174..9dd57f4 100644
--- a/debian/patches/debian/crypto-fix-abi-change-in-3.16.7-ckt25.patch
+++ b/debian/patches/debian/crypto-fix-abi-change-in-3.16.7-ckt25.patch
@@ -52,6 +52,16 @@ crypto_{ahash,ablkcipher}_has_setkey() functions.
  	if (alg->export)
  		hash->export = alg->export;
  	if (alg->import)
+--- a/crypto/blkcipher.c
++++ b/crypto/blkcipher.c
+@@ -471,7 +471,6 @@ 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;
+ }
 --- a/crypto/shash.c
 +++ b/crypto/shash.c
 @@ -24,11 +24,12 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git