diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 08:40:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 08:40:44 -0700 |
| commit | 491fba88036f54220ebdbb2d0fc54e17f68c6d7e (patch) | |
| tree | b181b3caa976d4d1409fb30d92bb451b1139ab3c /crypto | |
| parent | 4e162cdaa04aef597fab3bf2b413dcd8a6f2a9ae (diff) | |
| parent | 0eec8189c0b23c5d2b7ad9c11d955b4fc8bd74e0 (diff) | |
| download | linux-crypto-491fba88036f54220ebdbb2d0fc54e17f68c6d7e.tar.gz linux-crypto-491fba88036f54220ebdbb2d0fc54e17f68c6d7e.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
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 8aaf298a..362905e7 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 |