mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
f9ef0c5705
Refreshed all patches and removed upstreamed: oxnas/001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch oxnas/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch Fixes: CVE-2020-12114 and CVE-2020-11669 Runtime-tested on: qemu-x86-64 Compile-tested on: ath79/generic, x86/64, imx6 Signed-off-by: Petr Štetiar <ynezz@true.cz>
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
--- a/drivers/crypto/mxs-dcp.c
|
|
+++ b/drivers/crypto/mxs-dcp.c
|
|
@@ -831,6 +831,24 @@ static void dcp_sha_cra_exit(struct cryp
|
|
{
|
|
}
|
|
|
|
+static int dcp_sha_export(struct ahash_request *req, void *out)
|
|
+{
|
|
+ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
|
|
+
|
|
+ memcpy(out, rctx, sizeof(struct dcp_sha_req_ctx));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int dcp_sha_import(struct ahash_request *req, const void *in)
|
|
+{
|
|
+ struct dcp_sha_req_ctx *rctx = ahash_request_ctx(req);
|
|
+
|
|
+ memcpy(rctx, in, sizeof(struct dcp_sha_req_ctx));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* AES 128 ECB and AES 128 CBC */
|
|
static struct crypto_alg dcp_aes_algs[] = {
|
|
{
|
|
@@ -890,8 +908,11 @@ static struct ahash_alg dcp_sha1_alg = {
|
|
.final = dcp_sha_final,
|
|
.finup = dcp_sha_finup,
|
|
.digest = dcp_sha_digest,
|
|
+ .import = dcp_sha_import,
|
|
+ .export = dcp_sha_export,
|
|
.halg = {
|
|
.digestsize = SHA1_DIGEST_SIZE,
|
|
+ .statesize = sizeof(struct dcp_sha_req_ctx),
|
|
.base = {
|
|
.cra_name = "sha1",
|
|
.cra_driver_name = "sha1-dcp",
|
|
@@ -914,8 +935,11 @@ static struct ahash_alg dcp_sha256_alg =
|
|
.final = dcp_sha_final,
|
|
.finup = dcp_sha_finup,
|
|
.digest = dcp_sha_digest,
|
|
+ .import = dcp_sha_import,
|
|
+ .export = dcp_sha_export,
|
|
.halg = {
|
|
.digestsize = SHA256_DIGEST_SIZE,
|
|
+ .statesize = sizeof(struct dcp_sha_req_ctx),
|
|
.base = {
|
|
.cra_name = "sha256",
|
|
.cra_driver_name = "sha256-dcp",
|