2 files changed, 41 insertions, 13 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 39dbd8e4dde1..dc20a34ba5ef 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -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_MANAGER2
-        select CRYPTO_HASH
-        select CRYPTO_BLKCIPHER
        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
diff --git a/crypto/Makefile b/crypto/Makefile
index 5862b807334e..cd4a4ed078ff 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -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_BLKCIPHER2) += crypto_blkcipher.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.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_RNG2) += rng.o
-obj-$(CONFIG_CRYPTO_RNG) += krng.o
+obj-$(CONFIG_CRYPTO_RNG2) += krng.o
 obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
 obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o

diff --git a/crypto/Kconfig b/crypto/Kconfig index 39dbd8e4dde1..dc20a34ba5ef 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig
@@ -31,35 +31,63 @@ config CRYPTO_FIPS
31		31
32	config CRYPTO_ALGAPI	32	config CRYPTO_ALGAPI
33	tristate	33	tristate
		34	select CRYPTO_ALGAPI2
34	help	35	help
35	This option provides the API for cryptographic algorithms.	36	This option provides the API for cryptographic algorithms.
36		37
		38	config CRYPTO_ALGAPI2
		39	tristate
		40
37	config CRYPTO_AEAD	41	config CRYPTO_AEAD
38	tristate	42	tristate
		43	select CRYPTO_AEAD2
39	select CRYPTO_ALGAPI	44	select CRYPTO_ALGAPI
40		45
		46	config CRYPTO_AEAD2
		47	tristate
		48	select CRYPTO_ALGAPI2
		49
41	config CRYPTO_BLKCIPHER	50	config CRYPTO_BLKCIPHER
42	tristate	51	tristate
		52	select CRYPTO_BLKCIPHER2
43	select CRYPTO_ALGAPI	53	select CRYPTO_ALGAPI
44	select CRYPTO_RNG	54
		55	config CRYPTO_BLKCIPHER2
		56	tristate
		57	select CRYPTO_ALGAPI2
		58	select CRYPTO_RNG2
45		59
46	config CRYPTO_HASH	60	config CRYPTO_HASH
47	tristate	61	tristate
		62	select CRYPTO_HASH2
48	select CRYPTO_ALGAPI	63	select CRYPTO_ALGAPI
49		64
		65	config CRYPTO_HASH2
		66	tristate
		67	select CRYPTO_ALGAPI2
		68
50	config CRYPTO_RNG	69	config CRYPTO_RNG
51	tristate	70	tristate
		71	select CRYPTO_RNG2
52	select CRYPTO_ALGAPI	72	select CRYPTO_ALGAPI
53		73
		74	config CRYPTO_RNG2
		75	tristate
		76	select CRYPTO_ALGAPI2
		77
54	config CRYPTO_MANAGER	78	config CRYPTO_MANAGER
55	tristate "Cryptographic algorithm manager"	79	tristate "Cryptographic algorithm manager"
56	select CRYPTO_AEAD	80	select CRYPTO_MANAGER2
57	select CRYPTO_HASH
58	select CRYPTO_BLKCIPHER
59	help	81	help
60	Create default cryptographic template instantiations such as	82	Create default cryptographic template instantiations such as
61	cbc(aes).	83	cbc(aes).
62		84
		85	config CRYPTO_MANAGER2
		86	def_tristate CRYPTO_MANAGER \|\| (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
		87	select CRYPTO_AEAD2
		88	select CRYPTO_HASH2
		89	select CRYPTO_BLKCIPHER2
		90
63	config CRYPTO_GF128MUL	91	config CRYPTO_GF128MUL
64	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"	92	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
65	depends on EXPERIMENTAL	93	depends on EXPERIMENTAL


diff --git a/crypto/Makefile b/crypto/Makefile index 5862b807334e..cd4a4ed078ff 100644 --- a/crypto/Makefile +++ b/crypto/Makefile
@@ -9,24 +9,24 @@ obj-$(CONFIG_CRYPTO_FIPS) += fips.o
9		9
10	crypto_algapi-$(CONFIG_PROC_FS) += proc.o	10	crypto_algapi-$(CONFIG_PROC_FS) += proc.o
11	crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)	11	crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
12	obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o	12	obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o
13		13
14	obj-$(CONFIG_CRYPTO_AEAD) += aead.o	14	obj-$(CONFIG_CRYPTO_AEAD2) += aead.o
15		15
16	crypto_blkcipher-objs := ablkcipher.o	16	crypto_blkcipher-objs := ablkcipher.o
17	crypto_blkcipher-objs += blkcipher.o	17	crypto_blkcipher-objs += blkcipher.o
18	obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o	18	obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o
19	obj-$(CONFIG_CRYPTO_BLKCIPHER) += chainiv.o	19	obj-$(CONFIG_CRYPTO_BLKCIPHER2) += chainiv.o
20	obj-$(CONFIG_CRYPTO_BLKCIPHER) += eseqiv.o	20	obj-$(CONFIG_CRYPTO_BLKCIPHER2) += eseqiv.o
21	obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o	21	obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
22		22
23	crypto_hash-objs := hash.o	23	crypto_hash-objs := hash.o
24	crypto_hash-objs += ahash.o	24	crypto_hash-objs += ahash.o
25	obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o	25	obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
26		26
27	cryptomgr-objs := algboss.o testmgr.o	27	cryptomgr-objs := algboss.o testmgr.o
28		28
29	obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o	29	obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o
30	obj-$(CONFIG_CRYPTO_HMAC) += hmac.o	30	obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
31	obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o	31	obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
32	obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o	32	obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o
@@ -73,8 +73,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
73	obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o	73	obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
74	obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o	74	obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o
75	obj-$(CONFIG_CRYPTO_LZO) += lzo.o	75	obj-$(CONFIG_CRYPTO_LZO) += lzo.o
76	obj-$(CONFIG_CRYPTO_RNG) += rng.o	76	obj-$(CONFIG_CRYPTO_RNG2) += rng.o
77	obj-$(CONFIG_CRYPTO_RNG) += krng.o	77	obj-$(CONFIG_CRYPTO_RNG2) += krng.o
78	obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o	78	obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o
79	obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o	79	obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o
80		80