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

Commit e1147d8f authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Herbert Xu
Browse files

[CRYPTO] digest: Add alignment handling 



Some hash modules load/store data words directly.  The digest layer
should pass properly aligned buffer to update()/final() method.  This
patch also add cra_alignmask to some hash modules.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d00e708c

crypto/digest.c

+27 −15
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ static void update(struct crypto_tfm *tfm, 
                   struct scatterlist *sg, unsigned int nsg)

{

	unsigned int i;

	unsigned int alignmask = crypto_tfm_alg_alignmask(tfm);



	for (i = 0; i < nsg; i++) {
@@ -38,12 +39,24 @@ static void update(struct crypto_tfm *tfm, 
			unsigned int bytes_from_page = min(l, ((unsigned int)

							   (PAGE_SIZE)) - 

							   offset);

			char *p = crypto_kmap(pg, 0) + offset;

			char *src = crypto_kmap(pg, 0);

			char *p = src + offset;



			if (unlikely(offset & alignmask)) {

				unsigned int bytes =

					alignmask + 1 - (offset & alignmask);

				bytes = min(bytes, bytes_from_page);

				tfm->__crt_alg->cra_digest.dia_update

						(crypto_tfm_ctx(tfm), p,

						 bytes);

				p += bytes;

				bytes_from_page -= bytes;

				l -= bytes;

			}

			tfm->__crt_alg->cra_digest.dia_update

					(crypto_tfm_ctx(tfm), p,

					 bytes_from_page);

			crypto_kunmap(p, 0);

			crypto_kunmap(src, 0);

			crypto_yield(tfm);

			offset = 0;

			pg++;
@@ -54,6 +67,14 @@ static void update(struct crypto_tfm *tfm, 


static void final(struct crypto_tfm *tfm, u8 *out)

{

	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);

	if (unlikely((unsigned long)out & alignmask)) {

		unsigned int size = crypto_tfm_alg_digestsize(tfm);

		u8 buffer[size + alignmask];

		u8 *dst = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

		tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), dst);

		memcpy(out, dst, size);

	} else

		tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), out);

}
@@ -69,18 +90,9 @@ static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) 
static void digest(struct crypto_tfm *tfm,

                   struct scatterlist *sg, unsigned int nsg, u8 *out)

{

	unsigned int i;



	tfm->crt_digest.dit_init(tfm);

		

	for (i = 0; i < nsg; i++) {

		char *p = crypto_kmap(sg[i].page, 0) + sg[i].offset;

		tfm->__crt_alg->cra_digest.dia_update(crypto_tfm_ctx(tfm),

		                                      p, sg[i].length);

		crypto_kunmap(p, 0);

		crypto_yield(tfm);

	}

	crypto_digest_final(tfm, out);

	init(tfm);

	update(tfm, sg, nsg);

	final(tfm, out);

}



int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags)

crypto/michael_mic.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static struct crypto_alg michael_mic_alg = { 
	.cra_blocksize	= 8,

	.cra_ctxsize	= sizeof(struct michael_mic_ctx),

	.cra_module	= THIS_MODULE,

	.cra_alignmask	= 3,

	.cra_list	= LIST_HEAD_INIT(michael_mic_alg.cra_list),

	.cra_u		= { .digest = {

	.dia_digestsize	= 8,

crypto/sha1.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static struct crypto_alg alg = { 
	.cra_blocksize	=	SHA1_HMAC_BLOCK_SIZE,

	.cra_ctxsize	=	sizeof(struct sha1_ctx),

	.cra_module	=	THIS_MODULE,

	.cra_alignmask	=	3,

	.cra_list       =       LIST_HEAD_INIT(alg.cra_list),

	.cra_u		=	{ .digest = {

	.dia_digestsize	=	SHA1_DIGEST_SIZE,

crypto/sha256.c

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ static struct crypto_alg alg = { 
	.cra_blocksize	=	SHA256_HMAC_BLOCK_SIZE,

	.cra_ctxsize	=	sizeof(struct sha256_ctx),

	.cra_module	=	THIS_MODULE,

	.cra_alignmask	=	3,

	.cra_list       =       LIST_HEAD_INIT(alg.cra_list),

	.cra_u		=	{ .digest = {

	.dia_digestsize	=	SHA256_DIGEST_SIZE,

crypto/sha512.c

+2 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ static struct crypto_alg sha512 = { 
        .cra_blocksize  = SHA512_HMAC_BLOCK_SIZE,

        .cra_ctxsize    = sizeof(struct sha512_ctx),

        .cra_module     = THIS_MODULE,

	.cra_alignmask	= 3,

        .cra_list       = LIST_HEAD_INIT(sha512.cra_list),

        .cra_u          = { .digest = {

                                .dia_digestsize = SHA512_DIGEST_SIZE,
@@ -295,6 +296,7 @@ static struct crypto_alg sha384 = { 
        .cra_flags      = CRYPTO_ALG_TYPE_DIGEST,

        .cra_blocksize  = SHA384_HMAC_BLOCK_SIZE,

        .cra_ctxsize    = sizeof(struct sha512_ctx),

	.cra_alignmask	= 3,

        .cra_module     = THIS_MODULE,

        .cra_list       = LIST_HEAD_INIT(sha384.cra_list),

        .cra_u          = { .digest = {