Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[pandora-kernel.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 87bbc9c..50f4da4 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -427,6 +427,15 @@ config CRYPTO_MD5
        help
          MD5 message digest algorithm (RFC1321).
 
+config CRYPTO_MD5_OCTEON
+       tristate "MD5 digest algorithm (OCTEON)"
+       depends on CPU_CAVIUM_OCTEON
+       select CRYPTO_MD5
+       select CRYPTO_HASH
+       help
+         MD5 message digest algorithm (RFC1321) implemented
+         using OCTEON crypto instructions, when available.
+
 config CRYPTO_MD5_SPARC64
        tristate "MD5 digest algorithm (SPARC64)"
        depends on SPARC64
@@ -1505,6 +1514,15 @@ config CRYPTO_USER_API_SKCIPHER
          This option enables the user-spaces interface for symmetric
          key cipher algorithms.
 
+config CRYPTO_USER_API_RNG
+       tristate "User-space interface for random number generator algorithms"
+       depends on NET
+       select CRYPTO_RNG
+       select CRYPTO_USER_API
+       help
+         This option enables the user-spaces interface for random
+         number generator algorithms.
+
 config CRYPTO_HASH_INFO
        bool