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

crypto: inside-secure - Added support for authenc HMAC-SHA1/DES-CBC 



This patch adds support for the authenc(hmac(sha1),cbc(des)) aead

changes since v1:
- rebased on top of DES changes made to cryptodev/master

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

drivers/crypto/inside-secure/safexcel.c

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

	&safexcel_alg_hmac_sha3_384,

	&safexcel_alg_hmac_sha3_512,

	&safexcel_alg_authenc_hmac_sha1_cbc_des,

};



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
@@ -901,5 +901,6 @@ extern struct safexcel_alg_template safexcel_alg_hmac_sha3_224; 
extern struct safexcel_alg_template safexcel_alg_hmac_sha3_256;

extern struct safexcel_alg_template safexcel_alg_hmac_sha3_384;

extern struct safexcel_alg_template safexcel_alg_hmac_sha3_512;

extern struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des;



#endif

drivers/crypto/inside-secure/safexcel_cipher.c

+39 −0
Original line number Diff line number Diff line
@@ -366,6 +366,11 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key, 


	/* Encryption key */

	switch (ctx->alg) {

	case SAFEXCEL_DES:

		err = verify_aead_des_key(ctfm, keys.enckey, keys.enckeylen);

		if (unlikely(err))

			goto badkey_expflags;

		break;

	case SAFEXCEL_3DES:

		err = verify_aead_des3_key(ctfm, keys.enckey, keys.enckeylen);

		if (unlikely(err))
@@ -1841,6 +1846,40 @@ struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des3_ede = { 
	},

};



static int safexcel_aead_sha1_des_cra_init(struct crypto_tfm *tfm)

{

	struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);



	safexcel_aead_sha1_cra_init(tfm);

	ctx->alg = SAFEXCEL_DES; /* override default */

	return 0;

}



struct safexcel_alg_template safexcel_alg_authenc_hmac_sha1_cbc_des = {

	.type = SAFEXCEL_ALG_TYPE_AEAD,

	.algo_mask = SAFEXCEL_ALG_DES | SAFEXCEL_ALG_SHA1,

	.alg.aead = {

		.setkey = safexcel_aead_setkey,

		.encrypt = safexcel_aead_encrypt,

		.decrypt = safexcel_aead_decrypt,

		.ivsize = DES_BLOCK_SIZE,

		.maxauthsize = SHA1_DIGEST_SIZE,

		.base = {

			.cra_name = "authenc(hmac(sha1),cbc(des))",

			.cra_driver_name = "safexcel-authenc-hmac-sha1-cbc-des",

			.cra_priority = SAFEXCEL_CRA_PRIORITY,

			.cra_flags = CRYPTO_ALG_ASYNC |

				     CRYPTO_ALG_KERN_DRIVER_ONLY,

			.cra_blocksize = DES_BLOCK_SIZE,

			.cra_ctxsize = sizeof(struct safexcel_cipher_ctx),

			.cra_alignmask = 0,

			.cra_init = safexcel_aead_sha1_des_cra_init,

			.cra_exit = safexcel_aead_cra_exit,

			.cra_module = THIS_MODULE,

		},

	},

};



static int safexcel_aead_sha1_ctr_cra_init(struct crypto_tfm *tfm)

{

	struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE