diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /arch/arm64/crypto/sha2-ce-glue.c | |
| parent | d725332208ef13241fc435eece790c9d0ea16a4e (diff) | |
| parent | f858c7bcca8c20761a20593439fe998b4b67e86b (diff) | |
| download | talos-op-linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.gz talos-op-linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'arch/arm64/crypto/sha2-ce-glue.c')
| -rw-r--r-- | arch/arm64/crypto/sha2-ce-glue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c index 1340e44c048b..7cd587564a41 100644 --- a/arch/arm64/crypto/sha2-ce-glue.c +++ b/arch/arm64/crypto/sha2-ce-glue.c @@ -75,6 +75,9 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, static int sha256_ce_final(struct shash_desc *desc, u8 *out) { + struct sha256_ce_state *sctx = shash_desc_ctx(desc); + + sctx->finalize = 0; kernel_neon_begin_partial(28); sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform); kernel_neon_end(); |
