diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-26 10:43:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-26 10:43:52 -0700 |
| commit | 41ba50b0572e90ed3d24fe4def54567e9050bc47 (patch) | |
| tree | 7e9cda30663fafd49ee7c99ffd701f42d8fc5de3 /arch/x86 | |
| parent | 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 (diff) | |
| parent | c3a98c3ad5c0dc60a1ac66bf91147a3f39cac96b (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a regression in x86/poly1305"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86/poly1305 - add back a needed assignment
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/poly1305_glue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c index e508dbd91813..c44aba290fbb 100644 --- a/arch/x86/crypto/poly1305_glue.c +++ b/arch/x86/crypto/poly1305_glue.c @@ -158,6 +158,7 @@ static unsigned int crypto_poly1305_setdctxkey(struct poly1305_desc_ctx *dctx, dctx->s[1] = get_unaligned_le32(&inp[4]); dctx->s[2] = get_unaligned_le32(&inp[8]); dctx->s[3] = get_unaligned_le32(&inp[12]); + acc += POLY1305_BLOCK_SIZE; dctx->sset = true; } } |