summaryrefslogtreecommitdiff
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-17 18:48:51 -0800
committerDavid S. Miller <davem@davemloft.net>2015-02-17 18:48:51 -0800
commit11af4409245096cef96a41327ed970f8789e1c1c (patch)
tree80621c6623aa54dceafc5743c8a016b609d7dc46 /crypto/Kconfig
parentbaefc38c7ec56afcfa92594930b747a050c599b7 (diff)
parent9ece59e8fd3d017e04382709a4d48e81e00246fb (diff)
downloadlinux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.tar.gz
linux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to '')
-rw-r--r--crypto/Kconfig18
1 files changed, 18 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 87bbc9c1..50f4da44 100644
--- 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