diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 17:40:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 17:40:44 +0200 |
| commit | c09b5cbd0d88317785de87bcdfe4052f9785c473 (patch) | |
| tree | 3547b518d3683cd2f3ae8305aaefbad3cbcf7bc6 | |
| parent | Merge tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/l... (diff) | |
| parent | crypto: algif_aead - Disable AEAD user-space for now (diff) | |
| download | linux-c09b5cbd0d88317785de87bcdfe4052f9785c473.tar.xz linux-c09b5cbd0d88317785de87bcdfe4052f9785c473.zip | |
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/Kconfig | 9 |
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 |