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

Commit fe0a1951 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: add AEAD support 



Add CryptoCell AEAD support

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4d826b9

drivers/staging/ccree/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config CRYPTO_DEV_CCREE 
	select CRYPTO_HASH

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_AEAD

	select CRYPTO_AUTHENC

	select CRYPTO_SHA1

	select CRYPTO_MD5

drivers/staging/ccree/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_CRYPTO_DEV_CCREE) := ccree.o

ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_ivgen.o ssi_sram_mgr.o ssi_pm.o ssi_pm_ext.o
 
ccree-y := ssi_driver.o ssi_sysfs.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_aead.o ssi_ivgen.o ssi_sram_mgr.o ssi_pm.o ssi_pm_ext.o

drivers/staging/ccree/cc_crypto_ctx.h

+21 −0
Original line number Diff line number Diff line
@@ -263,6 +263,27 @@ struct drv_ctx_cipher { 
		(CC_AES_KEY_SIZE_MAX/sizeof(uint32_t))];

};



/* authentication and encryption with associated data class */

struct drv_ctx_aead {

	enum drv_crypto_alg alg; /* DRV_CRYPTO_ALG_AES */

	enum drv_cipher_mode mode;

	enum drv_crypto_direction direction;

	uint32_t key_size; /* numeric value in bytes   */

	uint32_t nonce_size; /* nonce size (octets) */

	uint32_t header_size; /* finit additional data size (octets) */

	uint32_t text_size; /* finit text data size (octets) */

	uint32_t tag_size; /* mac size, element of {4, 6, 8, 10, 12, 14, 16} */

	/* block_state1/2 is the AES engine block state */

	uint8_t block_state[CC_AES_BLOCK_SIZE];

	uint8_t mac_state[CC_AES_BLOCK_SIZE]; /* MAC result */

	uint8_t nonce[CC_AES_BLOCK_SIZE]; /* nonce buffer */

	uint8_t key[CC_AES_KEY_SIZE_MAX];

	/* reserve to end of allocated context size */

	uint32_t reserved[CC_DRV_CTX_SIZE_WORDS - 8 -

		3 * (CC_AES_BLOCK_SIZE/sizeof(uint32_t)) -

		CC_AES_KEY_SIZE_MAX/sizeof(uint32_t)];

};



/*******************************************************************/

/***************** MESSAGE BASED CONTEXTS **************************/

/*******************************************************************/