summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2007-11-29 09:53:52 -0500
committerVlad Yasevich <vladislav.yasevich@hp.com>2007-11-29 10:17:42 -0500
commitb7e0fe9f81e19c4f2a1369b324c3c062c1738be4 (patch)
treefe9d856c35e3d0ee5bd5acd9bd6b8dad93a3dd50 /net
parent555d3d5d2be13675490a80df0d7961551822ef1f (diff)
downloadlinux-3.10-b7e0fe9f81e19c4f2a1369b324c3c062c1738be4.tar.gz
linux-3.10-b7e0fe9f81e19c4f2a1369b324c3c062c1738be4.tar.bz2
linux-3.10-b7e0fe9f81e19c4f2a1369b324c3c062c1738be4.zip
SCTP: Fix build issues with SCTP AUTH.
SCTP-AUTH requires selection of CRYPTO, HMAC and SHA1 since SHA1 is a MUST requirement for AUTH. We also support SHA256, but that's optional, so fix the code to treat it as such. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/Kconfig6
-rw-r--r--net/sctp/auth.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig
index 8210f549c49..5390bc79215 100644
--- a/net/sctp/Kconfig
+++ b/net/sctp/Kconfig
@@ -6,9 +6,9 @@ menuconfig IP_SCTP
tristate "The SCTP Protocol (EXPERIMENTAL)"
depends on INET && 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
+ select CRYPTO_HMAC
+ select CRYPTO_SHA1
select CRYPTO_MD5 if SCTP_HMAC_MD5
---help---
Stream Control Transmission Protocol
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 6d89e35307a..97e6ebd1450 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -54,11 +54,13 @@ static struct sctp_hmac sctp_hmac_list[SCTP_AUTH_NUM_HMACS] = {
/* id 2 is reserved as well */
.hmac_id = SCTP_AUTH_HMAC_ID_RESERVED_2,
},
+#if defined (CONFIG_CRYPTO_SHA256) || defined (CONFIG_CRYPTO_SHA256_MODULE)
{
.hmac_id = SCTP_AUTH_HMAC_ID_SHA256,
.hmac_name="hmac(sha256)",
.hmac_len = SCTP_SHA256_SIG_SIZE,
}
+#endif
};