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

Commit 274a2f5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fixes from Herbert Xu:
 "This fixes the authenc self-test crash as well as a missing export of
  a symbol used by a module."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: authenc - Fix crash with zero-length assoc data
  crypto/caam: Export gen_split_key symbol for other modules
parents 2a1497c3 9b2f4cb6

crypto/authenc.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int crypto_authenc_genicv(struct aead_request *req, u8 *iv, 
		cryptlen += ivsize;

	}



	if (sg_is_last(assoc)) {

	if (req->assoclen && sg_is_last(assoc)) {

		authenc_ahash_fn = crypto_authenc_ahash;

		sg_init_table(asg, 2);

		sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
@@ -490,7 +490,7 @@ static int crypto_authenc_iverify(struct aead_request *req, u8 *iv, 
		cryptlen += ivsize;

	}



	if (sg_is_last(assoc)) {

	if (req->assoclen && sg_is_last(assoc)) {

		authenc_ahash_fn = crypto_authenc_ahash;

		sg_init_table(asg, 2);

		sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);

drivers/crypto/caam/key_gen.c

+1 −0
Original line number Diff line number Diff line
@@ -120,3 +120,4 @@ u32 gen_split_key(struct device *jrdev, u8 *key_out, int split_key_len, 


	return ret;

}

EXPORT_SYMBOL(gen_split_key);