Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to last commit.

Browse Source
This commit is contained in:
Simon Kelley
2014-01-25 23:46:23 +00:00
parent 8a9be9e493
commit 703c7ff429
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dnssec.c
View File

@@ -1393,7 +1393,8 @@ unsigned char* hash_questions(struct dns_header *header, size_t plen, char *name
if (!CHECK_LEN(header, p, plen, 0)) if (!CHECK_LEN(header, p, plen, 0))
return digest; /* bad packet */ return digest; /* bad packet */
} }
hash->digest(ctx, hash->digest_size, digest);
return digest; return digest;
} }

12
src/forward.c
View File

@@ -1375,7 +1375,7 @@ unsigned char *tcp_request(int confd, time_t now,
{ {
struct server *firstsendto = NULL; struct server *firstsendto = NULL;
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
unsigned char *newhash, *hash[HASH_SIZE]; unsigned char *newhash, hash[HASH_SIZE];
if ((newhash = hash_questions(header, (unsigned int)size, daemon->keyname))) if ((newhash = hash_questions(header, (unsigned int)size, daemon->keyname)))
memcpy(hash, newhash, HASH_SIZE); memcpy(hash, newhash, HASH_SIZE);
#else #else
@@ -1506,10 +1506,16 @@ unsigned char *tcp_request(int confd, time_t now,
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
newhash = hash_questions(header, (unsigned int)m, daemon->namebuff); newhash = hash_questions(header, (unsigned int)m, daemon->namebuff);
if (!newhash || memcmp(hash, newhash, HASH_SIZE) != 0) if (!newhash || memcmp(hash, newhash, HASH_SIZE) != 0)
break; {
m = 0;
break;
}
#else #else
if (crc != questions_crc(header, (unsigned int)m, daemon->namebuff)) if (crc != questions_crc(header, (unsigned int)m, daemon->namebuff))
break; {
m = 0;
break;
}
#endif #endif
m = process_reply(header, now, last_server, (unsigned int)m, m = process_reply(header, now, last_server, (unsigned int)m,