crypto: inside-secure - Fixed authenc w/ (3)DES fails on Macchiatobin (b8151220) · Commits · 戴 / test

Fixed 2 copy-paste mistakes in the commit mentioned below that caused authenc w/ (3)DES to consistently fail on Macchiatobin (but strangely work fine on x86+FPGA??). Now fully tested on both platforms. Fixes: ("crypto: inside-secure - Fixed warnings...") Signed-off-by:

Pascal van Leeuwen <pvanleeuwen@verimatrix.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

drivers/crypto/inside-secure/safexcel_cipher.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -405,7 +405,8 @@ static int safexcel_aead_setkey(struct crypto_aead ctfm, const u8 key,

		if (priv->flags & EIP197_TRC_CACHE && ctx->base.ctxr_dma) {
		for (i = 0; i < keys.enckeylen / sizeof(u32); i++) {
		if (le32_to_cpu(ctx->key[i]) != aes.key_enc[i]) {
		if (le32_to_cpu(ctx->key[i]) !=
		((u32 *)keys.enckey)[i]) {
		ctx->base.needs_inv = true;
		break;
		}
		@@ -459,7 +460,7 @@ static int safexcel_aead_setkey(struct crypto_aead ctfm, const u8 key,

		/* Now copy the keys into the context */
		for (i = 0; i < keys.enckeylen / sizeof(u32); i++)
		ctx->key[i] = cpu_to_le32(aes.key_enc[i]);
		ctx->key[i] = cpu_to_le32(((u32 *)keys.enckey)[i]);
		ctx->key_len = keys.enckeylen;

		memcpy(ctx->ipad, &istate.state, ctx->state_sz);

Admin message