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

Commit 9bd05f8c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "crypto: api - Introduce generic max blocksize and alignmask"

parents 9b7ae79e 69aafa11

crypto/algapi.c

+6 −1
Original line number Diff line number Diff line
@@ -57,9 +57,14 @@ static int crypto_check_alg(struct crypto_alg *alg) 
	if (alg->cra_alignmask & (alg->cra_alignmask + 1))

		return -EINVAL;



	if (alg->cra_blocksize > PAGE_SIZE / 8)

	/* General maximums for all algs. */

	if (alg->cra_alignmask > MAX_ALGAPI_ALIGNMASK)

		return -EINVAL;



	if (alg->cra_blocksize > MAX_ALGAPI_BLOCKSIZE)

		return -EINVAL;



	/* Lower maximums for specific alg types. */

	if (!alg->cra_type && (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==

			       CRYPTO_ALG_TYPE_CIPHER) {

		if (alg->cra_alignmask > MAX_CIPHER_ALIGNMASK)

include/crypto/algapi.h

+3 −1
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ 
/*

 * Maximum values for blocksize and alignmask, used to allocate

 * static buffers that are big enough for any combination of

 * ciphers and architectures.

 * algs and architectures. Ciphers have a lower maximum size.

 */

#define MAX_ALGAPI_BLOCKSIZE		160

#define MAX_ALGAPI_ALIGNMASK		63

#define MAX_CIPHER_BLOCKSIZE		16

#define MAX_CIPHER_ALIGNMASK		15