ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3704. [protocol] Accept integer timestamps in RRSIG records. [RT #35185]

Browse Source
This commit is contained in:
Mark Andrews
2014-01-14 16:08:16 +11:00
parent f49e5fe74c
commit 4cf64648da
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,3 +1,5 @@
3704. [protocol] Accept integer timestamps in RRSIG records. [RT #35185]
--- 9.6-ESV-R11rc1 released ---
3698. [cleanup] Replaced all uses of memcpy() with memmove().
lib/dns/rdata/generic/rrsig_46.c
+26 -2
View File
@@ -90,7 +90,19 @@ fromtext_rrsig(ARGS_FROMTEXT) {
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
ISC_FALSE));
RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
if (strlen(DNS_AS_STR(token)) <= 10U &&
*DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
char *end;
unsigned long l;
l = strtoul(DNS_AS_STR(token), &end, 10);
if (l == ULONG_MAX || *end != 0)
RETTOK(DNS_R_SYNTAX);
if ((isc_uint64_t)l > (isc_uint64_t)0xffffffff)
RETTOK(ISC_R_RANGE);
time_expire = l;
} else
RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
RETERR(uint32_tobuffer(time_expire, target));
/*
@@ -98,7 +110,19 @@ fromtext_rrsig(ARGS_FROMTEXT) {
*/
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
ISC_FALSE));
RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_signed));
if (strlen(DNS_AS_STR(token)) <= 10U &&
*DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
char *end;
unsigned long l;
l = strtoul(DNS_AS_STR(token), &end, 10);
if (l == ULONG_MAX || *end != 0)
RETTOK(DNS_R_SYNTAX);
if ((isc_uint64_t)l > (isc_uint64_t)0xffffffff)
RETTOK(ISC_R_RANGE);
time_signed = l;
} else
RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_signed));
RETERR(uint32_tobuffer(time_signed, target));
/*