Commit 453e3090 authored by Christian Lamparter's avatar Christian Lamparter Committed by Herbert Xu
Browse files

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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c587e65d

drivers/crypto/amcc/crypto4xx_alg.c

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int crypto4xx_setkey_aes(struct crypto_ablkcipher *cipher, 
				 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;
@@ -219,7 +219,7 @@ static int crypto4xx_hash_alg_init(struct crypto_tfm *tfm, 
				 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));

drivers/crypto/amcc/crypto4xx_sa.c

+6 −6
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ u32 get_dynamic_sa_offset_state_ptr_field(struct crypto4xx_ctx *ctx) 
	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 crypto4xx_ctx *ctx) 
	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(struct crypto4xx_ctx *ctx) 
	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);

}

drivers/crypto/amcc/crypto4xx_sa.h

+1 −1
Original line number Diff line number Diff line
@@ -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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE