diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-05-06 09:54:31 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-06 23:16:25 -0400 |
commit | bf7883ebcb9c0880b8f5d22c1435a3de15283f0a (patch) | |
tree | 52ac12c8913d8c2d24749463cb8a0c56cecd7f96 /arch/arm64 | |
parent | ac02c6ea6b404461829697792cd2b67f6a14d28a (diff) |
crypto: arm64/sha1-ce - prevent asm code finalization in final() path
Ensure that the asm code finalization path is not triggered when
invoked via final(), since it already takes care of that itself.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/crypto/sha1-ce-glue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c index 114e7cc5de8c..aefda9868627 100644 --- a/arch/arm64/crypto/sha1-ce-glue.c +++ b/arch/arm64/crypto/sha1-ce-glue.c | |||
@@ -74,6 +74,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, | |||
74 | 74 | ||
75 | static int sha1_ce_final(struct shash_desc *desc, u8 *out) | 75 | static int sha1_ce_final(struct shash_desc *desc, u8 *out) |
76 | { | 76 | { |
77 | struct sha1_ce_state *sctx = shash_desc_ctx(desc); | ||
78 | |||
79 | sctx->finalize = 0; | ||
77 | kernel_neon_begin_partial(16); | 80 | kernel_neon_begin_partial(16); |
78 | sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform); | 81 | sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform); |
79 | kernel_neon_end(); | 82 | kernel_neon_end(); |