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

Commit 7ffbc9da authored by Jan Glauber's avatar Jan Glauber Committed by Linus Torvalds
Browse files

[PATCH] s390: sha256 crypto code fix 



Fix processing of messages larger than 2 * SHA256_BLOCK_SIZE.

Signed-off-by: default avatarJan Glauber <jan.glauber@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fda5e142

arch/s390/crypto/sha256_s390.c

+22 −7
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static void sha256_update(void *ctx, const u8 *data, unsigned int len) 
{

	struct s390_sha256_ctx *sctx = ctx;

	unsigned int index;

	int ret;



	/* how much is already in the buffer? */

	index = sctx->count / 8 & 0x3f;
@@ -58,15 +59,29 @@ static void sha256_update(void *ctx, const u8 *data, unsigned int len) 
	/* update message bit length */

	sctx->count += len * 8;



	/* process one block */

	if ((index + len) >= SHA256_BLOCK_SIZE) {

	if ((index + len) < SHA256_BLOCK_SIZE)

		goto store;



	/* process one stored block */

	if (index) {

		memcpy(sctx->buf + index, data, SHA256_BLOCK_SIZE - index);

		crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf,

		ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, sctx->buf,

				      SHA256_BLOCK_SIZE);

		BUG_ON(ret != SHA256_BLOCK_SIZE);

		data += SHA256_BLOCK_SIZE - index;

		len -= SHA256_BLOCK_SIZE - index;

	}



	/* process as many blocks as possible */

	if (len >= SHA256_BLOCK_SIZE) {

		ret = crypt_s390_kimd(KIMD_SHA_256, sctx->state, data,

				      len & ~(SHA256_BLOCK_SIZE - 1));

		BUG_ON(ret != (len & ~(SHA256_BLOCK_SIZE - 1)));

		data += ret;

		len -= ret;

	}



store:

	/* anything left? */

	if (len)

		memcpy(sctx->buf + index , data, len);