Commit 5ba1c7b5 authored by Catalin Vasile's avatar Catalin Vasile Committed by Herbert Xu
Browse files

crypto: caam - fix rfc3686(ctr(aes)) IV load 



-nonce is being loaded using append_load_imm_u32() instead of
append_load_as_imm() (nonce is a byte array / stream, not a 4-byte
variable)
-counter is not being added in big endian format, as mandatated by
RFC3686 and expected by the crypto engine

Signed-off-by: default avatarCatalin Vasile <cata.vasile@nxp.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4cba7cf0

drivers/crypto/caam/caamalg.c

+40 −42
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static void append_key_aead(u32 *desc, struct caam_ctx *ctx, 
	if (is_rfc3686) {

		nonce = (u32 *)((void *)ctx->key + ctx->split_key_pad_len +

			       enckeylen);

		append_load_imm_u32(desc, *nonce, LDST_CLASS_IND_CCB |

		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,

				   LDST_CLASS_IND_CCB |

				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);

		append_move(desc,

			    MOVE_SRC_OUTFIFO |
@@ -500,8 +501,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 


	/* Load Counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));
@@ -567,8 +567,7 @@ skip_enc: 


	/* Load Counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));
@@ -672,8 +671,7 @@ copy_iv: 


	/* Load Counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));
@@ -1467,7 +1465,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 
	int ret = 0;

	u32 *key_jump_cmd;

	u32 *desc;

	u32 *nonce;

	u8 *nonce;

	u32 geniv;

	u32 ctx1_iv_off = 0;

	const bool ctr_mode = ((ctx->class1_alg_type & OP_ALG_AAI_MASK) ==
@@ -1520,8 +1518,9 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load nonce into CONTEXT1 reg */

	if (is_rfc3686) {

		nonce = (u32 *)(key + keylen);

		append_load_imm_u32(desc, *nonce, LDST_CLASS_IND_CCB |

		nonce = (u8 *)key + keylen;

		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,

				   LDST_CLASS_IND_CCB |

				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);

		append_move(desc, MOVE_WAITCOMP |

			    MOVE_SRC_OUTFIFO |
@@ -1538,8 +1537,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));
@@ -1579,8 +1577,9 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load nonce into CONTEXT1 reg */

	if (is_rfc3686) {

		nonce = (u32 *)(key + keylen);

		append_load_imm_u32(desc, *nonce, LDST_CLASS_IND_CCB |

		nonce = (u8 *)key + keylen;

		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,

				   LDST_CLASS_IND_CCB |

				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);

		append_move(desc, MOVE_WAITCOMP |

			    MOVE_SRC_OUTFIFO |
@@ -1597,8 +1596,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));
@@ -1642,8 +1640,9 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load Nonce into CONTEXT1 reg */

	if (is_rfc3686) {

		nonce = (u32 *)(key + keylen);

		append_load_imm_u32(desc, *nonce, LDST_CLASS_IND_CCB |

		nonce = (u8 *)key + keylen;

		append_load_as_imm(desc, nonce, CTR_RFC3686_NONCE_SIZE,

				   LDST_CLASS_IND_CCB |

				   LDST_SRCDST_BYTE_OUTFIFO | LDST_IMM);

		append_move(desc, MOVE_WAITCOMP |

			    MOVE_SRC_OUTFIFO |
@@ -1674,8 +1673,7 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *ablkcipher, 


	/* Load Counter into CONTEXT1 reg */

	if (is_rfc3686)

		append_load_imm_u32(desc, (u32)1, LDST_IMM |

				    LDST_CLASS_1_CCB |

		append_load_imm_be32(desc, 1, LDST_IMM | LDST_CLASS_1_CCB |

				     LDST_SRCDST_BYTE_CONTEXT |

				     ((ctx1_iv_off + CTR_RFC3686_IV_SIZE) <<

				      LDST_OFFSET_SHIFT));

drivers/crypto/caam/desc_constr.h

+17 −0
Original line number Diff line number Diff line
@@ -324,6 +324,23 @@ static inline void append_##cmd##_imm_##type(u32 *desc, type immediate, \ 
}

APPEND_CMD_RAW_IMM(load, LOAD, u32);



/*

 * ee - endianness

 * size - size of immediate type in bytes

 */

#define APPEND_CMD_RAW_IMM2(cmd, op, ee, size) \

static inline void append_##cmd##_imm_##ee##size(u32 *desc, \

						   u##size immediate, \

						   u32 options) \

{ \

	__##ee##size data = cpu_to_##ee##size(immediate); \

	PRINT_POS; \

	append_cmd(desc, CMD_##op | IMMEDIATE | options | sizeof(data)); \

	append_data(desc, &data, sizeof(data)); \

}



APPEND_CMD_RAW_IMM2(load, LOAD, be, 32);



/*

 * Append math command. Only the last part of destination and source need to

 * be specified

CRA Git | Maintained and supported by SUSTech CRA and CCSE