Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[TCP] MD5SIG: Kill CONFIG_TCP_MD5SIG_DEBUG.

Browse source 
It just obfuscates the code and adds limited value.  And as Adrian
Bunk noticed, it lacked Kconfig help text too, so just kill it.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-11-30 16:35:01 -08:00
parent e488eafcc5
commit 08dd1a506b
2 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ipv4/Kconfig
View file

@ -630,9 +630,5 @@ config TCP_MD5SIG
If unsure, say N. If unsure, say N.
config TCP_MD5SIG_DEBUG
bool "TCP: MD5 Signature Option debugging"
depends on TCP_MD5SIG
source "net/ipv4/ipvs/Kconfig" source "net/ipv4/ipvs/Kconfig"

41
net/ipv4/tcp_ipv4.c
View file

@ -1017,9 +1017,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
struct scatterlist sg[4]; struct scatterlist sg[4];
__u16 data_len; __u16 data_len;
int block = 0; int block = 0;
#ifdef CONFIG_TCP_MD5SIG_DEBUG
int i;
#endif
__sum16 old_checksum; __sum16 old_checksum;
struct tcp_md5sig_pool *hp; struct tcp_md5sig_pool *hp;
struct tcp4_pseudohdr *bp; struct tcp4_pseudohdr *bp;
@ -1052,13 +1049,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
sg_set_buf(&sg[block++], bp, sizeof(*bp)); sg_set_buf(&sg[block++], bp, sizeof(*bp));
nbytes += sizeof(*bp); nbytes += sizeof(*bp);
#ifdef CONFIG_TCP_MD5SIG_DEBUG
printk("Calcuating hash for: ");
for (i = 0; i < sizeof(*bp); i++)
printk("%02x ", (unsigned int)((unsigned char *)bp)[i]);
printk(" ");
#endif
/* 2. the TCP header, excluding options, and assuming a /* 2. the TCP header, excluding options, and assuming a
* checksum of zero/ * checksum of zero/
*/ */
@ -1066,10 +1056,7 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
th->check = 0; th->check = 0;
sg_set_buf(&sg[block++], th, sizeof(struct tcphdr)); sg_set_buf(&sg[block++], th, sizeof(struct tcphdr));
nbytes += sizeof(struct tcphdr); nbytes += sizeof(struct tcphdr);
#ifdef CONFIG_TCP_MD5SIG_DEBUG
for (i = 0; i < sizeof(struct tcphdr); i++)
printk(" %02x", (unsigned int)((unsigned char *)th)[i]);
#endif
/* 3. the TCP segment data (if any) */ /* 3. the TCP segment data (if any) */
data_len = tcplen - (th->doff << 2); data_len = tcplen - (th->doff << 2);
if (data_len > 0) { if (data_len > 0) {
@ -1084,12 +1071,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
sg_set_buf(&sg[block++], key->key, key->keylen); sg_set_buf(&sg[block++], key->key, key->keylen);
nbytes += key->keylen; nbytes += key->keylen;
#ifdef CONFIG_TCP_MD5SIG_DEBUG
printk(" and password: ");
for (i = 0; i < key->keylen; i++)
printk("%02x ", (unsigned int)key->key[i]);
#endif
/* Now store the Hash into the packet */ /* Now store the Hash into the packet */
err = crypto_hash_init(desc); err = crypto_hash_init(desc);
if (err) if (err)
@ -1106,12 +1087,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
th->check = old_checksum; th->check = old_checksum;
out: out:
#ifdef CONFIG_TCP_MD5SIG_DEBUG
printk(" result:");
for (i = 0; i < 16; i++)
printk(" %02x", (unsigned int)(((u8*)md5_hash)[i]));
printk("\n");
#endif
return 0; return 0;
clear_hash: clear_hash:
tcp_put_md5sig_pool(); tcp_put_md5sig_pool();
@ -1241,20 +1216,6 @@ static int tcp_v4_inbound_md5_hash(struct sock *sk, struct sk_buff *skb)
NIPQUAD(iph->saddr), ntohs(th->source), NIPQUAD(iph->saddr), ntohs(th->source),
NIPQUAD(iph->daddr), ntohs(th->dest), NIPQUAD(iph->daddr), ntohs(th->dest),
genhash ? " tcp_v4_calc_md5_hash failed" : ""); genhash ? " tcp_v4_calc_md5_hash failed" : "");
#ifdef CONFIG_TCP_MD5SIG_DEBUG
do {
int i;
printk("Received: ");
for (i = 0; i < 16; i++)
printk("%02x ",
0xff & (int)hash_location[i]);
printk("\n");
printk("Calculated: ");
for (i = 0; i < 16; i++)
printk("%02x ", 0xff & (int)newhash[i]);
printk("\n");
} while(0);
#endif
} }
return 1; return 1;
} }