summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-15 12:58:56 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-04-15 18:28:18 -0400
commite3b2854faabd10438f5e7e34e078b099c3375577 (patch)
tree71e0e77eeca9ae206e1a71ae7117a538df3ac2fb /net
parentc3dfc2808ab82b13f8b6db62189da959c2eadeea (diff)
downloadlinux-3.10-e3b2854faabd10438f5e7e34e078b099c3375577.tar.gz
linux-3.10-e3b2854faabd10438f5e7e34e078b099c3375577.tar.bz2
linux-3.10-e3b2854faabd10438f5e7e34e078b099c3375577.zip
SUNRPC: Fix the SUNRPC Kerberos V RPCSEC_GSS module dependencies
Since kernel 2.6.35, the SUNRPC Kerberos support has had an implicit dependency on a number of additional crypto modules. The following patch makes that dependency explicit. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/Kconfig9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index 8873fd8ddac..b2198e65d8b 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -18,14 +18,13 @@ config SUNRPC_XPRT_RDMA
If unsure, say N.
config RPCSEC_GSS_KRB5
- tristate
+ tristate "Secure RPC: Kerberos V mechanism"
depends on SUNRPC && CRYPTO
- prompt "Secure RPC: Kerberos V mechanism" if !(NFS_V4 || NFSD_V4)
+ depends on CRYPTO_MD5 && CRYPTO_DES && CRYPTO_CBC && CRYPTO_CTS
+ depends on CRYPTO_ECB && CRYPTO_HMAC && CRYPTO_SHA1 && CRYPTO_AES
+ depends on CRYPTO_ARC4
default y
select SUNRPC_GSS
- select CRYPTO_MD5
- select CRYPTO_DES
- select CRYPTO_CBC
help
Choose Y here to enable Secure RPC using the Kerberos version 5
GSS-API mechanism (RFC 1964).