Commit 493e289c authored by Pascal van Leeuwen's avatar Pascal van Leeuwen Committed by Herbert Xu
Browse files

crypto: inside-secure - Minor optimization recognizing CTR is always AES 



Moved counter mode handling code in front as it doesn't depend on the
rest of the code to be executed, it can just do its thing and exit.

Signed-off-by: default avatarPascal van Leeuwen <pvanleeuwen@verimatrix.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent aa88f331

drivers/crypto/inside-secure/safexcel_cipher.c

+14 −11
Original line number Diff line number Diff line
@@ -65,6 +65,19 @@ static void safexcel_cipher_token(struct safexcel_cipher_ctx *ctx, u8 *iv, 
{

	u32 block_sz = 0;



	if (ctx->mode == CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD) {

		cdesc->control_data.options |= EIP197_OPTION_4_TOKEN_IV_CMD;



		/* 32 bit nonce */

		cdesc->control_data.token[0] = ctx->nonce;

		/* 64 bit IV part */

		memcpy(&cdesc->control_data.token[1], iv, 8);

		/* 32 bit counter, start at 1 (big endian!) */

		cdesc->control_data.token[3] = cpu_to_be32(1);



		return;

	}



	if (ctx->mode != CONTEXT_CONTROL_CRYPTO_MODE_ECB) {

		switch (ctx->alg) {

		case SAFEXCEL_DES:
@@ -80,19 +93,9 @@ static void safexcel_cipher_token(struct safexcel_cipher_ctx *ctx, u8 *iv, 
			cdesc->control_data.options |= EIP197_OPTION_4_TOKEN_IV_CMD;

			break;

		}



		if (ctx->mode == CONTEXT_CONTROL_CRYPTO_MODE_CTR_LOAD) {

			/* 32 bit nonce */

			cdesc->control_data.token[0] = ctx->nonce;

			/* 64 bit IV part */

			memcpy(&cdesc->control_data.token[1], iv, 8);

			/* 32 bit counter, start at 1 (big endian!) */

			cdesc->control_data.token[3] = cpu_to_be32(1);

		} else {

		memcpy(cdesc->control_data.token, iv, block_sz);

	}

}

}



static void safexcel_skcipher_token(struct safexcel_cipher_ctx *ctx, u8 *iv,

				    struct safexcel_command_desc *cdesc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE