diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-12 07:14:17 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-12 07:14:17 +0800 |
| commit | 274a2f5ddb3e8bf67e561574e6529a65a4039240 (patch) | |
| tree | c0a7e840a98628ce7eff8dc307a3cdcb9cd33d1a | |
| parent | 2a1497c3c4e884d6886e13741d0ba1abd2631006 (diff) | |
| parent | 9b2f4cb65f7083cde86553cd56d6c2878e04932a (diff) | |
| download | linux-keystone-274a2f5ddb3e8bf67e561574e6529a65a4039240.tar.gz | |
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
| -rw-r--r-- | crypto/authenc.c | 4 | ||||
| -rw-r--r-- | drivers/crypto/caam/key_gen.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c index 5ef7ba6b6a76a3..d0583a4489e60e 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c @@ -336,7 +336,7 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv, cryptlen += ivsize; } - if (sg_is_last(assoc)) { + if (req->assoclen && sg_is_last(assoc)) { authenc_ahash_fn = crypto_authenc_ahash; sg_init_table(asg, 2); sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); @@ -490,7 +490,7 @@ static int crypto_authenc_iverify(struct aead_request *req, u8 *iv, cryptlen += ivsize; } - if (sg_is_last(assoc)) { + if (req->assoclen && sg_is_last(assoc)) { authenc_ahash_fn = crypto_authenc_ahash; sg_init_table(asg, 2); sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index 002888185f170e..d216cd3cc569ec 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c @@ -120,3 +120,4 @@ u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, return ret; } +EXPORT_SYMBOL(gen_split_key); |