Commit 12adf9d6 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: omap-aes-gcm - add missing .setauthsize hooks 



GCM only permits certain tag lengths, so populate the .setauthsize
hooks which ensure that only permitted sizes are accepted by the
implementation.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarTero Kristo <t-kristo@ti.com>
Tested-by: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 46d57443

drivers/crypto/omap-aes-gcm.c

+11 −0
Original line number Diff line number Diff line
@@ -413,3 +413,14 @@ int omap_aes_4106gcm_setkey(struct crypto_aead *tfm, const u8 *key, 


	return 0;

}



int omap_aes_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize)

{

	return crypto_gcm_check_authsize(authsize);

}



int omap_aes_4106gcm_setauthsize(struct crypto_aead *parent,

				 unsigned int authsize)

{

	return crypto_rfc4106_check_authsize(authsize);

}

drivers/crypto/omap-aes.c

+2 −0
Original line number Diff line number Diff line
@@ -787,6 +787,7 @@ static struct aead_alg algs_aead_gcm[] = { 
	.ivsize		= GCM_AES_IV_SIZE,

	.maxauthsize	= AES_BLOCK_SIZE,

	.setkey		= omap_aes_gcm_setkey,

	.setauthsize	= omap_aes_gcm_setauthsize,

	.encrypt	= omap_aes_gcm_encrypt,

	.decrypt	= omap_aes_gcm_decrypt,

},
@@ -807,6 +808,7 @@ static struct aead_alg algs_aead_gcm[] = { 
	.maxauthsize	= AES_BLOCK_SIZE,

	.ivsize		= GCM_RFC4106_IV_SIZE,

	.setkey		= omap_aes_4106gcm_setkey,

	.setauthsize	= omap_aes_4106gcm_setauthsize,

	.encrypt	= omap_aes_4106gcm_encrypt,

	.decrypt	= omap_aes_4106gcm_decrypt,

},

drivers/crypto/omap-aes.h

+3 −0
Original line number Diff line number Diff line
@@ -202,8 +202,11 @@ int omap_aes_4106gcm_setkey(struct crypto_aead *tfm, const u8 *key, 
			    unsigned int keylen);

int omap_aes_gcm_encrypt(struct aead_request *req);

int omap_aes_gcm_decrypt(struct aead_request *req);

int omap_aes_gcm_setauthsize(struct crypto_aead *tfm, unsigned int authsize);

int omap_aes_4106gcm_encrypt(struct aead_request *req);

int omap_aes_4106gcm_decrypt(struct aead_request *req);

int omap_aes_4106gcm_setauthsize(struct crypto_aead *parent,

				 unsigned int authsize);

int omap_aes_write_ctrl(struct omap_aes_dev *dd);

int omap_aes_crypt_dma_start(struct omap_aes_dev *dd);

int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE