Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

torvalds · torvalds · commit 41ba50b0572e · 2020-10-26T10:43:52.000-07:00
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
diff --git 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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ static unsigned int crypto_poly1305_setdctxkey(struct poly1305_desc_ctx *dctx,`
`158`	`158`	`dctx->s[1] = get_unaligned_le32(&inp[4]);`
`159`	`159`	`dctx->s[2] = get_unaligned_le32(&inp[8]);`
`160`	`160`	`dctx->s[3] = get_unaligned_le32(&inp[12]);`
	`161`	`+ acc += POLY1305_BLOCK_SIZE;`
`161`	`162`	`dctx->sset = true;`
`162`	`163`	`}`
`163`	`164`	`}`