summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-27 08:40:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-27 08:40:44 -0700
commitc09b5cbd0d88317785de87bcdfe4052f9785c473 (patch)
tree3547b518d3683cd2f3ae8305aaefbad3cbcf7bc6
parenta8b253b9f253c05e5e10b829b8d1fb24556f4b56 (diff)
parentf858c7bcca8c20761a20593439fe998b4b67e86b (diff)
downloadkernel-c09b5cbd0d88317785de87bcdfe4052f9785c473.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This disables the newly (4.1) added user-space AEAD interface so that we can fix issues in the underlying kernel AEAD interface. Once the new kernel AEAD interface is ready we can then reenable the user-space AEAD interface" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - Disable AEAD user-space for now
-rw-r--r--crypto/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 8aaf298a80e1..362905e7c841 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1512,15 +1512,6 @@ config CRYPTO_USER_API_RNG
This option enables the user-spaces interface for random
number generator algorithms.
-config CRYPTO_USER_API_AEAD
- tristate "User-space interface for AEAD cipher algorithms"
- depends on NET
- select CRYPTO_AEAD
- select CRYPTO_USER_API
- help
- This option enables the user-spaces interface for AEAD
- cipher algorithms.
-
config CRYPTO_HASH_INFO
bool