tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
"This fixes the authenc self-test crash as well as a missing export of
a symbol used by a module."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: authenc - Fix crash with zero-length assoc data
crypto/caam: Export gen_split_key symbol for other modules

Linus Torvalds 274a2f5d 2a1497c3

+3 -2
+2 -2
crypto/authenc.c
··· 336 336 cryptlen += ivsize; 337 337 } 338 338 339 - if (sg_is_last(assoc)) { 339 + if (req->assoclen && sg_is_last(assoc)) { 340 340 authenc_ahash_fn = crypto_authenc_ahash; 341 341 sg_init_table(asg, 2); 342 342 sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); ··· 490 490 cryptlen += ivsize; 491 491 } 492 492 493 - if (sg_is_last(assoc)) { 493 + if (req->assoclen && sg_is_last(assoc)) { 494 494 authenc_ahash_fn = crypto_authenc_ahash; 495 495 sg_init_table(asg, 2); 496 496 sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
+1
drivers/crypto/caam/key_gen.c
··· 120 120 121 121 return ret; 122 122 } 123 + EXPORT_SYMBOL(gen_split_key);