lkml.org 
[lkml]   [2004]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] net/sctp/Config.in make oldconfig compatibility (bash)
On Tue, 17 Feb 2004, Matthias Andree wrote:

> Hello,
>
> I've needed the patch enclosed below the signature to remove some "make
> oldconfig" complaints in the current Linux-2.4 BK version.
>
> Please Cc: feedback to my sender address unless you are including
> linux-kernel; I'm not subscribed to lksctp-developers.
>

I thought SCTP changes were backed out just because of these 'make oldconfig'
errors from the 2.4 tree.

Anyway, i have submitted the attached patch that should fix this to davem.
'make oldconfig' and 'make menuconfig' worked fine after applying this patch.

However i am having problem with 'make xconfig'. When CONFIG_SCTP_HMAC_MD5
or CONFIG_SCTP_HMAC_SHA1 is enabled, everything under Crptographic options
is greyed out.

I would appreciate if some config expert can take a look at this and figure
out what is happening.

Thanks
Sridhar

-------------------------------------------------------------------------------
diff -Nru a/crypto/Config.in b/crypto/Config.in
--- a/crypto/Config.in Mon Feb 16 15:39:29 2004
+++ b/crypto/Config.in Mon Feb 16 15:39:29 2004
@@ -11,7 +11,9 @@
"$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \
- "$CONFIG_INET6_ESP" = "m" ]; then
+ "$CONFIG_INET6_ESP" = "m" -o \
+ "$CONFIG_SCTP_HMAC_MD5" = "y" -o \
+ "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
define_bool CONFIG_CRYPTO y
else
bool 'Cryptographic API' CONFIG_CRYPTO
@@ -25,7 +27,9 @@
"$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \
- "$CONFIG_INET6_ESP" = "m" ]; then
+ "$CONFIG_INET6_ESP" = "m" -o \
+ "$CONFIG_SCTP_HMAC_MD5" = "y" -o \
+ "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
define_bool CONFIG_CRYPTO_HMAC y
else
bool ' HMAC support' CONFIG_CRYPTO_HMAC
@@ -39,7 +43,8 @@
"$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \
- "$CONFIG_INET6_ESP" = "m" ]; then
+ "$CONFIG_INET6_ESP" = "m" -o \
+ "$CONFIG_SCTP_HMAC_MD5" = "y" ]; then
define_bool CONFIG_CRYPTO_MD5 y
else
tristate ' MD5 digest algorithm' CONFIG_CRYPTO_MD5
@@ -51,7 +56,8 @@
"$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \
"$CONFIG_INET6_ESP" = "y" -o \
- "$CONFIG_INET6_ESP" = "m" ]; then
+ "$CONFIG_INET6_ESP" = "m" -o \
+ "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
define_bool CONFIG_CRYPTO_SHA1 y
else
tristate ' SHA1 digest algorithm' CONFIG_CRYPTO_SHA1
diff -Nru a/net/sctp/Config.in b/net/sctp/Config.in
--- a/net/sctp/Config.in Mon Feb 16 15:39:29 2004
+++ b/net/sctp/Config.in Mon Feb 16 15:39:29 2004
@@ -14,31 +14,9 @@
if [ "$CONFIG_IP_SCTP" != "n" ]; then
bool ' SCTP: Debug messages' CONFIG_SCTP_DBG_MSG
bool ' SCTP: Debug object counts' CONFIG_SCTP_DBG_OBJCNT
-fi
-if [ "$CONFIG_CRYPTO_HMAC" = "n"]; then
- choice 'SCTP: Cookie HMAC Algorithm' \
- "HMAC-NONE CONFIG_SCTP_HMAC_NONE" HMAC-NONE
-else
- if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n"]; then
- choice 'SCTP: Cookie HMAC Algorithm' \
- "HMAC-NONE CONFIG_SCTP_HMAC_NONE" HMAC-NONE
- else
- if [ "$CONFIG_CRYPTO_MD5" != "n" -a "$CONFIG_CRYPTO_SHA1" != "n"]; then
- choice 'SCTP: Cookie HMAC Algorithm' \
- "HMAC-NONE CONFIG_SCTP_HMAC_NONE \
- HMAC-SHA1 CONFIG_SCTP_HMAC_SHA1 \
- HMAC-MD5 CONFIG_SCTP_HMAC_MD5" HMAC-SHA1
- else
- if [ "$CONFIG_CRYPTO_MD5" != "n" ]; then
- choice 'SCTP: Cookie HMAC Algorithm' \
- "HMAC-NONE CONFIG_SCTP_HMAC_NONE \
- HMAC-MD5 CONFIG_SCTP_HMAC_MD5" HMAC-MD5
- else
- choice 'SCTP: Cookie HMAC Algorithm' \
- "HMAC-NONE CONFIG_SCTP_HMAC_NONE \
- HMAC-SHA1 CONFIG_SCTP_HMAC_SHA1" HMAC-SHA1
- fi
- fi
- fi
+choice 'SCTP: Cookie HMAC Algorithm' \
+ "HMAC-NONE CONFIG_SCTP_HMAC_NONE \
+ HMAC-SHA1 CONFIG_SCTP_HMAC_SHA1 \
+ HMAC-MD5 CONFIG_SCTP_HMAC_MD5" HMAC-SHA1
fi
endmenu
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:01    [W:0.042 / U:0.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site