projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fiq_debugger: merge from linux 3.10
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
ablk_helper.c
diff --git
a/crypto/ablk_helper.c
b/crypto/ablk_helper.c
index 62568b1fc885fa2f9f4ef61d61f1772339acc6c8..e1fcf53bb931f1832e34591063cab0f5abc1d9b2 100644
(file)
--- a/
crypto/ablk_helper.c
+++ b/
crypto/ablk_helper.c
@@
-75,7
+75,7
@@
int ablk_encrypt(struct ablkcipher_request *req)
struct ablkcipher_request *cryptd_req =
ablkcipher_request_ctx(req);
struct ablkcipher_request *cryptd_req =
ablkcipher_request_ctx(req);
-
memcpy(cryptd_req, req, sizeof(*req))
;
+
*cryptd_req = *req
;
ablkcipher_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base);
return crypto_ablkcipher_encrypt(cryptd_req);
ablkcipher_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base);
return crypto_ablkcipher_encrypt(cryptd_req);
@@
-94,7
+94,7
@@
int ablk_decrypt(struct ablkcipher_request *req)
struct ablkcipher_request *cryptd_req =
ablkcipher_request_ctx(req);
struct ablkcipher_request *cryptd_req =
ablkcipher_request_ctx(req);
-
memcpy(cryptd_req, req, sizeof(*req))
;
+
*cryptd_req = *req
;
ablkcipher_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base);
return crypto_ablkcipher_decrypt(cryptd_req);
ablkcipher_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base);
return crypto_ablkcipher_decrypt(cryptd_req);
@@
-124,7
+124,8
@@
int ablk_init_common(struct crypto_tfm *tfm, const char *drv_name)
struct async_helper_ctx *ctx = crypto_tfm_ctx(tfm);
struct cryptd_ablkcipher *cryptd_tfm;
struct async_helper_ctx *ctx = crypto_tfm_ctx(tfm);
struct cryptd_ablkcipher *cryptd_tfm;
- cryptd_tfm = cryptd_alloc_ablkcipher(drv_name, 0, 0);
+ cryptd_tfm = cryptd_alloc_ablkcipher(drv_name, CRYPTO_ALG_INTERNAL,
+ CRYPTO_ALG_INTERNAL);
if (IS_ERR(cryptd_tfm))
return PTR_ERR(cryptd_tfm);
if (IS_ERR(cryptd_tfm))
return PTR_ERR(cryptd_tfm);