aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorStephan Mueller <smueller@chronox.de>2015-02-28 14:50:40 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2015-03-04 04:12:39 -0500
commit44cac4fce9b820c37a8792df52a0e4ce33201949 (patch)
tree63447d58368442e103f930f8766696678bc1f778 /crypto
parent400c40cf78da00c16e561a3a253ca272455c42ef (diff)
crypto: algif - enable AEAD interface compilation
Enable compilation of the AEAD AF_ALG support and provide a Kconfig option to compile the AEAD AF_ALG support. Signed-off-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig9
-rw-r--r--crypto/Makefile1
2 files changed, 10 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 67275b7f176d..e74cecadef70 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1552,6 +1552,15 @@ config CRYPTO_USER_API_RNG
1552 This option enables the user-spaces interface for random 1552 This option enables the user-spaces interface for random
1553 number generator algorithms. 1553 number generator algorithms.
1554 1554
1555config CRYPTO_USER_API_AEAD
1556 tristate "User-space interface for AEAD cipher algorithms"
1557 depends on NET
1558 select CRYPTO_AEAD
1559 select CRYPTO_USER_API
1560 help
1561 This option enables the user-spaces interface for AEAD
1562 cipher algorithms.
1563
1555config CRYPTO_HASH_INFO 1564config CRYPTO_HASH_INFO
1556 bool 1565 bool
1557 1566
diff --git a/crypto/Makefile b/crypto/Makefile
index ba19465f9ad3..97b7d3ac87e7 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -100,6 +100,7 @@ obj-$(CONFIG_CRYPTO_USER_API) += af_alg.o
100obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o 100obj-$(CONFIG_CRYPTO_USER_API_HASH) += algif_hash.o
101obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o 101obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) += algif_skcipher.o
102obj-$(CONFIG_CRYPTO_USER_API_RNG) += algif_rng.o 102obj-$(CONFIG_CRYPTO_USER_API_RNG) += algif_rng.o
103obj-$(CONFIG_CRYPTO_USER_API_AEAD) += algif_aead.o
103 104
104# 105#
105# generic algorithms and the async_tx api 106# generic algorithms and the async_tx api