mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
b765f4be40
Refreshed all patches. Altered patches: - 150-bridge_allow_receiption_on_disabled_port.patch - 201-extra_optimization.patch Remove upstreamed: - 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
88 lines
3.3 KiB
Diff
88 lines
3.3 KiB
Diff
From 453e3090b9c3f5da70b21648c2244e9821f0916d Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@googlemail.com>
|
|
Date: Fri, 25 Aug 2017 15:47:19 +0200
|
|
Subject: [PATCH 06/25] crypto: crypto4xx - fix dynamic_sa_ctl's sa_contents
|
|
declaration
|
|
|
|
The driver had a union dynamic_sa_contents in place that
|
|
described the meaning of the bits in the sa_contents
|
|
variable.
|
|
|
|
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_alg.c | 4 ++--
|
|
drivers/crypto/amcc/crypto4xx_sa.c | 12 ++++++------
|
|
drivers/crypto/amcc/crypto4xx_sa.h | 2 +-
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_alg.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_alg.c
|
|
@@ -150,7 +150,7 @@ static int crypto4xx_setkey_aes(struct c
|
|
SA_NOT_COPY_HDR);
|
|
crypto4xx_memcpy_le(ctx->sa_in + get_dynamic_sa_offset_key_field(ctx),
|
|
key, keylen);
|
|
- sa->sa_contents = SA_AES_CONTENTS | (keylen << 2);
|
|
+ sa->sa_contents.w = SA_AES_CONTENTS | (keylen << 2);
|
|
sa->sa_command_1.bf.key_len = keylen >> 3;
|
|
ctx->is_hash = 0;
|
|
ctx->direction = DIR_INBOUND;
|
|
@@ -220,7 +220,7 @@ static int crypto4xx_hash_alg_init(struc
|
|
SA_NOT_COPY_PAD, SA_NOT_COPY_PAYLOAD,
|
|
SA_NOT_COPY_HDR);
|
|
ctx->direction = DIR_INBOUND;
|
|
- sa->sa_contents = SA_HASH160_CONTENTS;
|
|
+ sa->sa_contents.w = SA_HASH160_CONTENTS;
|
|
sa_in = (struct dynamic_sa_hash160 *) ctx->sa_in;
|
|
/* Need to zero hash digest in SA */
|
|
memset(sa_in->inner_digest, 0, sizeof(sa_in->inner_digest));
|
|
--- a/drivers/crypto/amcc/crypto4xx_sa.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_sa.c
|
|
@@ -40,9 +40,9 @@ u32 get_dynamic_sa_offset_state_ptr_fiel
|
|
union dynamic_sa_contents cts;
|
|
|
|
if (ctx->direction == DIR_INBOUND)
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w;
|
|
else
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w;
|
|
offset = cts.bf.key_size
|
|
+ cts.bf.inner_size
|
|
+ cts.bf.outer_size
|
|
@@ -66,9 +66,9 @@ u32 get_dynamic_sa_iv_size(struct crypto
|
|
union dynamic_sa_contents cts;
|
|
|
|
if (ctx->direction == DIR_INBOUND)
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w;
|
|
else
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w;
|
|
return (cts.bf.iv0 + cts.bf.iv1 + cts.bf.iv2 + cts.bf.iv3) * 4;
|
|
}
|
|
|
|
@@ -77,9 +77,9 @@ u32 get_dynamic_sa_offset_key_field(stru
|
|
union dynamic_sa_contents cts;
|
|
|
|
if (ctx->direction == DIR_INBOUND)
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents.w;
|
|
else
|
|
- cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
|
|
+ cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents.w;
|
|
|
|
return sizeof(struct dynamic_sa_ctl);
|
|
}
|
|
--- a/drivers/crypto/amcc/crypto4xx_sa.h
|
|
+++ b/drivers/crypto/amcc/crypto4xx_sa.h
|
|
@@ -169,7 +169,7 @@ union sa_command_1 {
|
|
} __attribute__((packed));
|
|
|
|
struct dynamic_sa_ctl {
|
|
- u32 sa_contents;
|
|
+ union dynamic_sa_contents sa_contents;
|
|
union sa_command_0 sa_command_0;
|
|
union sa_command_1 sa_command_1;
|
|
} __attribute__((packed));
|