diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2004-07-29 01:48:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-07-29 01:48:49 -0700 |
| commit | ccd8a57ae5fe4071f3e6afb49ddeb53e38bae456 (patch) | |
| tree | 765ef3030b01281fe5368ae449168004e3f6b178 /net | |
| parent | 7ecdfc3488b433a9d651beeb2f320b520e327a82 (diff) | |
| download | history-ccd8a57ae5fe4071f3e6afb49ddeb53e38bae456.tar.gz | |
[NET]: Allow MD5 to be a module
I found that recent 2.6 kernels no longer allowed me to build MD5 as
a module even though everything that used it were modules (including
ipv6 and sctp). It turns out that there were boolean options
selecting MD5 in the Kconfig files. Due to limitations in the current
kconfig implementation, this forces MD5 to be a boolean as well.
The usual workaround in these cases is to move the selection up
to the closest tristate. This is what the following patch does.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 2 | ||||
| -rw-r--r-- | net/ipv6/Kconfig | 2 | ||||
| -rw-r--r-- | net/sctp/Kconfig | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/net/Kconfig b/net/Kconfig index 6b033215e64949..a558582251c249 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -109,6 +109,8 @@ source "net/ipv4/Kconfig" config IPV6 tristate "The IPv6 protocol (EXPERIMENTAL)" depends on INET && EXPERIMENTAL + select CRYPTO if IPV6_PRIVACY + select CRYPTO_MD5 if IPV6_PRIVACY ---help--- This is experimental support for the IP version 6 (formerly called IPng "IP next generation"). You will still be able to do diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index f5b568867e08ea..23c5759c022d9b 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -4,8 +4,6 @@ config IPV6_PRIVACY bool "IPv6: Privacy Extensions (RFC 3041) support" depends on IPV6 - select CRYPTO - select CRYPTO_MD5 ---help--- Privacy Extensions for Stateless Address Autoconfiguration in IPv6 support. With this option, additional periodically-alter diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig index d7757c951c38b2..9cba49e2ad4318 100644 --- a/net/sctp/Kconfig +++ b/net/sctp/Kconfig @@ -8,6 +8,10 @@ menu "SCTP Configuration (EXPERIMENTAL)" config IP_SCTP tristate "The SCTP Protocol (EXPERIMENTAL)" depends on IPV6 || IPV6=n + select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5 + select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5 + select CRYPTO_SHA1 if SCTP_HMAC_SHA1 + select CRYPTO_MD5 if SCTP_HMAC_MD5 ---help--- Stream Control Transmission Protocol @@ -71,18 +75,12 @@ config SCTP_HMAC_NONE config SCTP_HMAC_SHA1 bool "HMAC-SHA1" - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_SHA1 help Enable the use of HMAC-SHA1 during association establishment. It is advised to use either HMAC-MD5 or HMAC-SHA1. config SCTP_HMAC_MD5 bool "HMAC-MD5" - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_MD5 help Enable the use of HMAC-MD5 during association establishment. It is advised to use either HMAC-MD5 or HMAC-SHA1. |