Skip to content

Commit

Permalink
[TCP] MD5SIG: Kill CONFIG_TCP_MD5SIG_DEBUG.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Dec 3, 2006
1 parent e488eaf commit 08dd1a5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 44 deletions.
4 changes: 0 additions & 4 deletions net/ipv4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,5 @@ config TCP_MD5SIG

If unsure, say N.

config TCP_MD5SIG_DEBUG
bool "TCP: MD5 Signature Option debugging"
depends on TCP_MD5SIG

source "net/ipv4/ipvs/Kconfig"

41 changes: 1 addition & 40 deletions net/ipv4/tcp_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -1017,9 +1017,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
struct scatterlist sg[4];
__u16 data_len;
int block = 0;
#ifdef CONFIG_TCP_MD5SIG_DEBUG
int i;
#endif
__sum16 old_checksum;
struct tcp_md5sig_pool *hp;
struct tcp4_pseudohdr *bp;
Expand Down Expand Up @@ -1052,24 +1049,14 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
sg_set_buf(&sg[block++], bp, 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
* checksum of zero/
*/
old_checksum = th->check;
th->check = 0;
sg_set_buf(&sg[block++], th, 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) */
data_len = tcplen - (th->doff << 2);
if (data_len > 0) {
Expand All @@ -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);
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 */
err = crypto_hash_init(desc);
if (err)
Expand All @@ -1106,12 +1087,6 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
th->check = old_checksum;

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;
clear_hash:
tcp_put_md5sig_pool();
Expand Down Expand Up @@ -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->daddr), ntohs(th->dest),
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;
}
Expand Down

0 comments on commit 08dd1a5

Please sign in to comment.