Commit 01b6ba6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.17-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "Fix a regression that broke hmac(sha3-224-s390)"

* tag 'v6.17-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hash - Increase HASH_MAX_DESCSIZE for hmac(sha3-224-s390)
parents ccc1ead2 9d9b193e

include/crypto/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct shash_desc { 
 * Worst case is hmac(sha3-224-s390).  Its context is a nested 'shash_desc'

 * containing a 'struct s390_sha_ctx'.

 */

#define HASH_MAX_DESCSIZE	(sizeof(struct shash_desc) + 360)

#define HASH_MAX_DESCSIZE	(sizeof(struct shash_desc) + 361)

#define MAX_SYNC_HASH_REQSIZE	(sizeof(struct ahash_request) + \

				 HASH_MAX_DESCSIZE)