diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-26 00:55:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-26 00:55:07 -0500 |
| commit | dd38d298385cb054263e634cf94cf18dc3ae1fc1 (patch) | |
| tree | 1176d6c5a490c1480537c73555a0df3b4164aac9 /drivers | |
| parent | 9c3973966fdd3f235466195189eca362557ef098 (diff) | |
| parent | 274252862f386b7868f35bf5ceaa5391a8ccfdf3 (diff) | |
Merge git://github.com/herbertx/crypto
* git://github.com/herbertx/crypto:
crypto: mv_cesa - fix hashing of chunks > 1920 bytes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/mv_cesa.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c index 5c6f56f21443..dcd8babae9eb 100644 --- a/drivers/crypto/mv_cesa.c +++ b/drivers/crypto/mv_cesa.c | |||
| @@ -343,11 +343,13 @@ static void mv_process_hash_current(int first_block) | |||
| 343 | else | 343 | else |
| 344 | op.config |= CFG_MID_FRAG; | 344 | op.config |= CFG_MID_FRAG; |
| 345 | 345 | ||
| 346 | writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A); | 346 | if (first_block) { |
| 347 | writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B); | 347 | writel(req_ctx->state[0], cpg->reg + DIGEST_INITIAL_VAL_A); |
| 348 | writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C); | 348 | writel(req_ctx->state[1], cpg->reg + DIGEST_INITIAL_VAL_B); |
| 349 | writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D); | 349 | writel(req_ctx->state[2], cpg->reg + DIGEST_INITIAL_VAL_C); |
| 350 | writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E); | 350 | writel(req_ctx->state[3], cpg->reg + DIGEST_INITIAL_VAL_D); |
| 351 | writel(req_ctx->state[4], cpg->reg + DIGEST_INITIAL_VAL_E); | ||
| 352 | } | ||
| 351 | } | 353 | } |
| 352 | 354 | ||
| 353 | memcpy(cpg->sram + SRAM_CONFIG, &op, sizeof(struct sec_accel_config)); | 355 | memcpy(cpg->sram + SRAM_CONFIG, &op, sizeof(struct sec_accel_config)); |