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

Commit b8815026 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] xcbc: Fix crash with IPsec
  [CRYPTO] xts: Use proper alignment
  [CRYPTO] digest: Include internal.h for prototypes
  [CRYPTO] authenc: Add missing Kconfig dependency on BLKCIPHER
  [CRYPTO] skcipher: Move chainiv/seqiv into crypto_blkcipher module
parents 910da1a4 2f40a178

crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ config CRYPTO_TEST 
config CRYPTO_AUTHENC

	tristate "Authenc support"

	select CRYPTO_AEAD

	select CRYPTO_BLKCIPHER

	select CRYPTO_MANAGER

	select CRYPTO_HASH

	help

crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ obj-$(CONFIG_CRYPTO_AEAD) += aead.o 


crypto_blkcipher-objs := ablkcipher.o

crypto_blkcipher-objs += blkcipher.o

crypto_blkcipher-objs += chainiv.o

crypto_blkcipher-objs += eseqiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o



crypto_hash-objs := hash.o

crypto/ablkcipher.c

+0 −3
Original line number Diff line number Diff line
@@ -341,6 +341,3 @@ struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name, 
	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(crypto_alloc_ablkcipher);
 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Asynchronous block chaining cipher type");

crypto/blkcipher.c

+29 −0
Original line number Diff line number Diff line
@@ -696,5 +696,34 @@ void skcipher_geniv_exit(struct crypto_tfm *tfm) 
}

EXPORT_SYMBOL_GPL(skcipher_geniv_exit);



static int __init blkcipher_module_init(void)

{

	int err;



	err = chainiv_module_init();

	if (err)

		goto out;



	err = eseqiv_module_init();

	if (err)

		goto eseqiv_err;



out:

	return err;



eseqiv_err:

	chainiv_module_exit();

	goto out;

}



static void __exit blkcipher_module_exit(void)

{

	eseqiv_module_exit();

	chainiv_module_exit();

}



module_init(blkcipher_module_init);

module_exit(blkcipher_module_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Generic block chaining cipher type");

crypto/chainiv.c

+4 −8
Original line number Diff line number Diff line
@@ -314,18 +314,14 @@ static struct crypto_template chainiv_tmpl = { 
	.module = THIS_MODULE,

};



static int __init chainiv_module_init(void)

int __init chainiv_module_init(void)

{

	return crypto_register_template(&chainiv_tmpl);

}

EXPORT_SYMBOL_GPL(chainiv_module_init);



static void __exit chainiv_module_exit(void)

void __exit chainiv_module_exit(void)

{

	crypto_unregister_template(&chainiv_tmpl);

}



module_init(chainiv_module_init);

module_exit(chainiv_module_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Chain IV Generator");
 
EXPORT_SYMBOL_GPL(chainiv_module_exit);