Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 01:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: caam - check authsize

Browse Source 
Check authsize to solve the extra tests that expect -EINVAL to be
returned when the authentication tag size is not valid.

Validated authsize for GCM, RFC4106 and RFC4543.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geanta <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Iuliana Prodan 2019-07-31 16:08:06 +03:00 committed by Herbert Xu
parent 836d8f43c5
commit 68a51394f3
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/crypto/caam/caamalg.c
View File

@ -376,6 +376,11 @@ static int gcm_set_sh_desc(struct crypto_aead *aead)
static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize) static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_gcm_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
gcm_set_sh_desc(authenc); gcm_set_sh_desc(authenc);
@ -439,6 +444,11 @@ static int rfc4106_setauthsize(struct crypto_aead *authenc,
unsigned int authsize) unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_rfc4106_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4106_set_sh_desc(authenc); rfc4106_set_sh_desc(authenc);
@ -503,6 +513,9 @@ static int rfc4543_setauthsize(struct crypto_aead *authenc,
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
if (authsize != 16)
return -EINVAL;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4543_set_sh_desc(authenc); rfc4543_set_sh_desc(authenc);

13
drivers/crypto/caam/caamalg_qi.c
View File

@ -371,6 +371,11 @@ static int gcm_set_sh_desc(struct crypto_aead *aead)
static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize) static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_gcm_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
gcm_set_sh_desc(authenc); gcm_set_sh_desc(authenc);
@ -472,6 +477,11 @@ static int rfc4106_setauthsize(struct crypto_aead *authenc,
unsigned int authsize) unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_rfc4106_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4106_set_sh_desc(authenc); rfc4106_set_sh_desc(authenc);
@ -578,6 +588,9 @@ static int rfc4543_setauthsize(struct crypto_aead *authenc,
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
if (authsize != 16)
return -EINVAL;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4543_set_sh_desc(authenc); rfc4543_set_sh_desc(authenc);

13
drivers/crypto/caam/caamalg_qi2.c
View File

@ -720,6 +720,11 @@ static int gcm_set_sh_desc(struct crypto_aead *aead)
static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize) static int gcm_setauthsize(struct crypto_aead *authenc, unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_gcm_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
gcm_set_sh_desc(authenc); gcm_set_sh_desc(authenc);
@ -812,6 +817,11 @@ static int rfc4106_setauthsize(struct crypto_aead *authenc,
unsigned int authsize) unsigned int authsize)
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
int err;
err = crypto_rfc4106_check_authsize(authsize);
if (err)
return err;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4106_set_sh_desc(authenc); rfc4106_set_sh_desc(authenc);
@ -911,6 +921,9 @@ static int rfc4543_setauthsize(struct crypto_aead *authenc,
{ {
struct caam_ctx *ctx = crypto_aead_ctx(authenc); struct caam_ctx *ctx = crypto_aead_ctx(authenc);
if (authsize != 16)
return -EINVAL;
ctx->authsize = authsize; ctx->authsize = authsize;
rfc4543_set_sh_desc(authenc); rfc4543_set_sh_desc(authenc);