Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c09b5cbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a8b253b9 f858c7bc

crypto/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -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