Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (c3b25b32) · Commits · e / devices / android_kernel_teracube_2e

crypto/cts.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,9 @@ static int cts_cbc_encrypt(struct crypto_cts_ctx *ctx,
		if (lastn < 0)
		return -EINVAL;

		sg_init_table(sgsrc, 1);
		sg_init_table(sgdst, 1);

		memset(s, 0, sizeof(s));
		scatterwalk_map_and_copy(s, src, offset, nbytes, 0);

		@@ -172,6 +175,9 @@ static int cts_cbc_decrypt(struct crypto_cts_ctx *ctx,
		if (lastn < 0)
		return -EINVAL;

		sg_init_table(sgsrc, 1);
		sg_init_table(sgdst, 1);

		scatterwalk_map_and_copy(s, src, offset, nbytes, 0);

		lcldesc.tfm = ctx->child;