Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87eee125 authored by Antoine Tenart's avatar Antoine Tenart Committed by Herbert Xu
Browse files

crypto: inside-secure - authenc(hmac(sha512), cbc(aes)) support 



This patch adds the authenc(hmac(sha512),cbc(aes)) algorithm support to
the Inside Secure SafeXcel driver.

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0de54fb1

drivers/crypto/inside-secure/safexcel.c

+1 −0
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ static struct safexcel_alg_template *safexcel_algs[] = { 
	&safexcel_alg_authenc_hmac_sha1_cbc_aes,

	&safexcel_alg_authenc_hmac_sha224_cbc_aes,

	&safexcel_alg_authenc_hmac_sha256_cbc_aes,

	&safexcel_alg_authenc_hmac_sha512_cbc_aes,

};



static int safexcel_register_algorithms(struct safexcel_crypto_priv *priv)

drivers/crypto/inside-secure/safexcel.h

+1 −0
Original line number Diff line number Diff line
@@ -680,5 +680,6 @@ extern struct safexcel_alg_template safexcel_alg_hmac_sha512; 
extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_aes;

extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes;

extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha256_cbc_aes;

extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes;



#endif

drivers/crypto/inside-secure/safexcel_cipher.c

+41 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ struct safexcel_cipher_ctx { 
	/* All the below is AEAD specific */

	u32 alg;

	u32 state_sz;

	u32 ipad[SHA256_DIGEST_SIZE / sizeof(u32)];

	u32 opad[SHA256_DIGEST_SIZE / sizeof(u32)];

	u32 ipad[SHA512_DIGEST_SIZE / sizeof(u32)];

	u32 opad[SHA512_DIGEST_SIZE / sizeof(u32)];

};



struct safexcel_cipher_req {
@@ -200,6 +200,11 @@ static int safexcel_aead_aes_setkey(struct crypto_aead *ctfm, const u8 *key, 
					 keys.authkeylen, &istate, &ostate))

			goto badkey;

		break;

	case CONTEXT_CONTROL_CRYPTO_ALG_SHA512:

		if (safexcel_hmac_setkey("safexcel-sha512", keys.authkey,

					 keys.authkeylen, &istate, &ostate))

			goto badkey;

		break;

	default:

		dev_err(priv->dev, "aead: unsupported hash algorithm\n");

		goto badkey;
@@ -1019,3 +1024,37 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha224_cbc_aes = { 
		},

	},

};



static int safexcel_aead_sha512_cra_init(struct crypto_tfm *tfm)

{

	struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);



	safexcel_aead_cra_init(tfm);

	ctx->alg = CONTEXT_CONTROL_CRYPTO_ALG_SHA512;

	ctx->state_sz = SHA512_DIGEST_SIZE;

	return 0;

}



struct safexcel_alg_template safexcel_alg_authenc_hmac_sha512_cbc_aes = {

	.type = SAFEXCEL_ALG_TYPE_AEAD,

	.alg.aead = {

		.setkey = safexcel_aead_aes_setkey,

		.encrypt = safexcel_aead_encrypt,

		.decrypt = safexcel_aead_decrypt,

		.ivsize = AES_BLOCK_SIZE,

		.maxauthsize = SHA512_DIGEST_SIZE,

		.base = {

			.cra_name = "authenc(hmac(sha512),cbc(aes))",

			.cra_driver_name = "safexcel-authenc-hmac-sha512-cbc-aes",

			.cra_priority = 300,

			.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC |

				     CRYPTO_ALG_KERN_DRIVER_ONLY,

			.cra_blocksize = AES_BLOCK_SIZE,

			.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),

			.cra_alignmask = 0,

			.cra_init = safexcel_aead_sha512_cra_init,

			.cra_exit = safexcel_aead_cra_exit,

			.cra_module = THIS_MODULE,

		},

	},

};