Commit 4e6f2ba9 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: api - Disallow cryptomgr as a module if algorithms are built-in
parents 44f6cc31 6a0fcbb4

crypto/Kconfig

+32 −4
Original line number Diff line number Diff line
@@ -31,35 +31,63 @@ config CRYPTO_FIPS 


config CRYPTO_ALGAPI

	tristate

	select CRYPTO_ALGAPI2

	help

	  This option provides the API for cryptographic algorithms.



config CRYPTO_ALGAPI2

	tristate



config CRYPTO_AEAD

	tristate

	select CRYPTO_AEAD2

	select CRYPTO_ALGAPI



config CRYPTO_AEAD2

	tristate

	select CRYPTO_ALGAPI2



config CRYPTO_BLKCIPHER

	tristate

	select CRYPTO_BLKCIPHER2

	select CRYPTO_ALGAPI

	select CRYPTO_RNG



config CRYPTO_BLKCIPHER2

	tristate

	select CRYPTO_ALGAPI2

	select CRYPTO_RNG2



config CRYPTO_HASH

	tristate

	select CRYPTO_HASH2

	select CRYPTO_ALGAPI



config CRYPTO_HASH2

	tristate

	select CRYPTO_ALGAPI2



config CRYPTO_RNG

	tristate

	select CRYPTO_RNG2

	select CRYPTO_ALGAPI



config CRYPTO_RNG2

	tristate

	select CRYPTO_ALGAPI2



config CRYPTO_MANAGER

	tristate "Cryptographic algorithm manager"

	select CRYPTO_AEAD

	select CRYPTO_HASH

	select CRYPTO_BLKCIPHER

	select CRYPTO_MANAGER2

	help

	  Create default cryptographic template instantiations such as

	  cbc(aes).



config CRYPTO_MANAGER2

	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)

	select CRYPTO_AEAD2

	select CRYPTO_HASH2

	select CRYPTO_BLKCIPHER2



config CRYPTO_GF128MUL

	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

	depends on EXPERIMENTAL

crypto/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -9,24 +9,24 @@ obj-$(CONFIG_CRYPTO_FIPS) += fips.o 


crypto_algapi-$(CONFIG_PROC_FS) += proc.o

crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)

obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o

obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o



obj-$(CONFIG_CRYPTO_AEAD) += aead.o

obj-$(CONFIG_CRYPTO_AEAD2) += aead.o



crypto_blkcipher-objs := ablkcipher.o

crypto_blkcipher-objs += blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o

obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o

obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o



crypto_hash-objs := hash.o

crypto_hash-objs += ahash.o

obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o

obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o



cryptomgr-objs := algboss.o testmgr.o



obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o

obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o

obj-$(CONFIG_CRYPTO_HMAC) += hmac.o

obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o

obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
@@ -73,8 +73,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o 
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o

obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o

obj-$(CONFIG_CRYPTO_LZO) += lzo.o

obj-$(CONFIG_CRYPTO_RNG) += rng.o

obj-$(CONFIG_CRYPTO_RNG) += krng.o

obj-$(CONFIG_CRYPTO_RNG2) += rng.o

obj-$(CONFIG_CRYPTO_RNG2) += krng.o

obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o

obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o