upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 08:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix inconsistencies in inline signing time comparisons (#42112)

Browse source 
(cherry picked from commit 4176d278e2)
(cherry picked from commit eeb16584fb)
(cherry picked from commit fb5c4bc94c)
This commit is contained in:
Mukund Sivaraman 2017-04-21 16:40:34 +05:30
parent 3664176a73
commit 4973497287
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,3 +1,8 @@
4599. [bug] Fix inconsistencies in inline signing time
comparison that were introduced with the
introduction of rdatasetheader->resign_lsb.
[RT #42112]
4597. [bug] The validator now ignores SHA-1 DS digest type
when a DS record with SHA-384 digest type is
present and is a supported digest type.

20
lib/dns/rbtdb.c
View file

@ -588,7 +588,7 @@ struct dns_rbtdb {
* context to use for the heap (which differs from the main
* database memory context in the case of a cache).
*/
isc_mem_t * hmctx;
isc_mem_t *hmctx;
isc_heap_t **heaps;
/* Locked by tree_lock. */
@ -911,9 +911,7 @@ ttl_sooner(void *v1, void *v2) {
rdatasetheader_t *h1 = v1;
rdatasetheader_t *h2 = v2;
if (h1->rdh_ttl < h2->rdh_ttl)
return (ISC_TRUE);
return (ISC_FALSE);
return (ISC_TF(h1->rdh_ttl < h2->rdh_ttl));
}
static isc_boolean_t
@ -921,10 +919,9 @@ resign_sooner(void *v1, void *v2) {
rdatasetheader_t *h1 = v1;
rdatasetheader_t *h2 = v2;
if (h1->resign < h2->resign ||
(h1->resign == h2->resign && h1->resign_lsb < h2->resign_lsb))
return (ISC_TRUE);
return (ISC_FALSE);
return (ISC_TF(h1->resign < h2->resign ||
(h1->resign == h2->resign &&
h1->resign_lsb < h2->resign_lsb)));
}
/*%
@ -6322,7 +6319,8 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
init_rdataset(rbtdb, newheader);
if (loading && RESIGN(newheader) &&
RESIGN(header) &&
header->resign < newheader->resign) {
resign_sooner(header, newheader))
{
newheader->resign = header->resign;
newheader->resign_lsb =
header->resign_lsb;
@ -7643,7 +7641,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
NODE_LOCK(&rbtdb->node_locks[header->node->locknum].lock,
isc_rwlocktype_write);
oldresign = header->resign;
oldresign = (header->resign << 1) | header->resign_lsb;
header->resign = (isc_stdtime_t)(dns_time64_from32(resign) >> 1);
header->resign_lsb = resign & 0x1;
if (header->heap_index != 0) {
@ -7691,7 +7689,7 @@ getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset,
}
if (header == NULL)
header = this;
else if (isc_serial_lt(this->resign, header->resign)) {
else if (resign_sooner(this, header)) {
locknum = header->node->locknum;
NODE_UNLOCK(&rbtdb->node_locks[locknum].lock,
isc_rwlocktype_read);