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

Commit 7e2f037b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] tcrypt: Fix error checking for comp allocation
  [CRYPTO] doc: Fix typo in hash example
  [CRYPTO] api: scatterwalk_copychunks() fails to advance through scatterlist
parents 0a14fe6e 7bc301e9

Documentation/crypto/api-intro.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ Here's an example of how to use the API: 
	desc.tfm = tfm;

	desc.flags = 0;

	

	if (crypto_hash_digest(&desc, &sg, 2, result))

	if (crypto_hash_digest(&desc, sg, 2, result))

		fail();

	

	crypto_free_hash(tfm);

crypto/scatterwalk.c

+2 −2
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk, 
		memcpy_dir(buf, vaddr, len_this_page, out);

		scatterwalk_unmap(vaddr, out);



		scatterwalk_advance(walk, nbytes);



		if (nbytes == len_this_page)

			break;
@@ -99,7 +101,5 @@ void scatterwalk_copychunks(void *buf, struct scatter_walk *walk, 


		scatterwalk_pagedone(walk, out, 1);

	}



	scatterwalk_advance(walk, nbytes);

}

EXPORT_SYMBOL_GPL(scatterwalk_copychunks);

crypto/tcrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static void test_deflate(void) 
	tv = (void *)tvmem;



	tfm = crypto_alloc_comp("deflate", 0, CRYPTO_ALG_ASYNC);

	if (tfm == NULL) {

	if (IS_ERR(tfm)) {

		printk("failed to load transform for deflate\n");

		return;

	}