diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
| commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch) | |
| tree | e19ab2c41ae47250fd614418022b32aa783aa563 /crypto | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 3c7c5dab44d6c8861bc86dab924353d8d40344f8 (diff) | |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/authenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c index 5ef7ba6b6a76..d0583a4489e6 100644 --- a/crypto/authenc.c +++ b/crypto/authenc.c | |||
| @@ -336,7 +336,7 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv, | |||
| 336 | cryptlen += ivsize; | 336 | cryptlen += ivsize; |
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | if (sg_is_last(assoc)) { | 339 | if (req->assoclen && sg_is_last(assoc)) { |
| 340 | authenc_ahash_fn = crypto_authenc_ahash; | 340 | authenc_ahash_fn = crypto_authenc_ahash; |
| 341 | sg_init_table(asg, 2); | 341 | sg_init_table(asg, 2); |
| 342 | sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); | 342 | 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, | |||
| 490 | cryptlen += ivsize; | 490 | cryptlen += ivsize; |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | if (sg_is_last(assoc)) { | 493 | if (req->assoclen && sg_is_last(assoc)) { |
| 494 | authenc_ahash_fn = crypto_authenc_ahash; | 494 | authenc_ahash_fn = crypto_authenc_ahash; |
| 495 | sg_init_table(asg, 2); | 495 | sg_init_table(asg, 2); |
| 496 | sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); | 496 | sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset); |