diff options
| author | Romain Perier <romain.perier@free-electrons.com> | 2016-07-28 11:59:43 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-29 18:30:17 +0800 |
| commit | 8cf740ae85df69fb6376f31b42eb2ac7a138721f (patch) | |
| tree | 9000e18f8485d8921a00d333abf4c162e6eb1485 /drivers/crypto | |
| parent | 4816c9406430d0d3d4fa58a212a7a869d429b315 (diff) | |
| download | blackbird-op-linux-8cf740ae85df69fb6376f31b42eb2ac7a138721f.tar.gz blackbird-op-linux-8cf740ae85df69fb6376f31b42eb2ac7a138721f.zip | |
crypto: marvell - Don't copy IV vectors from the _process op for ciphers
The IV output vectors should only be copied from the _complete operation
and not from the _process operation, i.e only from the operation that is
designed to copy the result of the request to the right location. This
copy is already done in the _complete operation, so this commit removes
the duplicated code in the _process op.
Fixes: 3610d6cd5231 ("crypto: marvell - Add a complete...")
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/marvell/cipher.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c index 8391aba04f2b..d19dc9614e6e 100644 --- a/drivers/crypto/marvell/cipher.c +++ b/drivers/crypto/marvell/cipher.c @@ -139,20 +139,11 @@ static int mv_cesa_ablkcipher_process(struct crypto_async_request *req, struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req); struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq); struct mv_cesa_req *basereq = &creq->base; - unsigned int ivsize; - int ret; if (mv_cesa_req_get_type(basereq) == CESA_STD_REQ) return mv_cesa_ablkcipher_std_process(ablkreq, status); - ret = mv_cesa_dma_process(basereq, status); - if (ret) - return ret; - - ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(ablkreq)); - memcpy_fromio(ablkreq->info, basereq->chain.last->data, ivsize); - - return 0; + return mv_cesa_dma_process(basereq, status); } static void mv_cesa_ablkcipher_step(struct crypto_async_request *req) |
