diff --git a/lib/dns/update.c b/lib/dns/update.c index f062e8aff6..b4d2a1258e 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -1502,6 +1502,13 @@ dns__jitter_expire(dns_zone_t *zone) { jitter = dns_kasp_sigjitter(kasp); sigvalidity = dns_kasp_sigvalidity(kasp); INSIST(jitter <= sigvalidity); + } else { + jitter = dns_zone_getsigresigninginterval(zone); + if (jitter > sigvalidity) { + jitter = sigvalidity; + } else { + jitter = sigvalidity - jitter; + } } if (jitter > sigvalidity) { diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 4cbb3d316a..2bf1a50bb8 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -7200,6 +7200,13 @@ calculate_rrsig_validity(dns_zone_t *zone, isc_stdtime_t now, jitter = dns_kasp_sigjitter(zone->kasp); sigvalidity = dns_kasp_sigvalidity(zone->kasp); INSIST(jitter <= sigvalidity); + } else { + jitter = dns_zone_getsigresigninginterval(zone); + if (jitter > sigvalidity) { + jitter = sigvalidity; + } else { + jitter = sigvalidity - jitter; + } } if (jitter > sigvalidity) {