Commit 41ba50b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9480b4e7 c3a98c3a

arch/x86/crypto/poly1305_glue.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

		}

	}