diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 11:40:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-27 11:40:44 -0400 |
| commit | c09b5cbd0d88317785de87bcdfe4052f9785c473 (patch) | |
| tree | 3547b518d3683cd2f3ae8305aaefbad3cbcf7bc6 /crypto | |
| parent | a8b253b9f253c05e5e10b829b8d1fb24556f4b56 (diff) | |
| parent | f858c7bcca8c20761a20593439fe998b4b67e86b (diff) | |
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 8aaf298a80e1..362905e7c841 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -1512,15 +1512,6 @@ config CRYPTO_USER_API_RNG | |||
| 1512 | This option enables the user-spaces interface for random | 1512 | This option enables the user-spaces interface for random |
| 1513 | number generator algorithms. | 1513 | number generator algorithms. |
| 1514 | 1514 | ||
| 1515 | config CRYPTO_USER_API_AEAD | ||
| 1516 | tristate "User-space interface for AEAD cipher algorithms" | ||
| 1517 | depends on NET | ||
| 1518 | select CRYPTO_AEAD | ||
| 1519 | select CRYPTO_USER_API | ||
| 1520 | help | ||
| 1521 | This option enables the user-spaces interface for AEAD | ||
| 1522 | cipher algorithms. | ||
| 1523 | |||
| 1524 | config CRYPTO_HASH_INFO | 1515 | config CRYPTO_HASH_INFO |
| 1525 | bool | 1516 | bool |
| 1526 | 1517 | ||