pullup:

1006.   [bug]           If a KEY RR was found missing during DNSSEC validation,
			an assertion failure could subsequently be triggered
			in the resolver. [RT #1763]

diff --git a/CHANGES b/CHANGES
index 7b2679d5747960b6c229d52cda462630c300ff13..b78c93e511adf68828c1ed58ab9b037aa90118e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1006.  [bug]           If a KEY RR was found missing during DNSSEC validation,
+                       an assertion failure could subsequently be triggered
+                       in the resolver. [RT #1763]
+
 1005.  [bug]           Don't copy nonzero RCODEs from request to response.
                        [RT #1765]
 

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 682e8de616e5f51776a50e335118cc767ac8aaf0..44c7e088aebab53248086dc3b2e4f710d289784d 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.81 2001/05/10 17:51:49 gson Exp $ */
+/* $Id: result.h,v 1.81.2.1 2001/09/19 21:51:42 bwelling Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
@@ -114,8 +114,10 @@
 #define DNS_R_UNKNOWNPROTO             (ISC_RESULTCLASS_DNS + 75)
 #define DNS_R_CLOCKSKEW                        (ISC_RESULTCLASS_DNS + 76)
 #define DNS_R_BADIXFR                  (ISC_RESULTCLASS_DNS + 77)
+/* #define DNS_R_unused                        (ISC_RESULTCLASS_DNS + 78) */
+#define DNS_R_NOVALIDKEY               (ISC_RESULTCLASS_DNS + 79)
 
-#define DNS_R_NRESULTS                 78      /* Number of results */
+#define DNS_R_NRESULTS                 80      /* Number of results */
 
 /*
  * DNS wire format rcodes.

diff --git a/lib/dns/result.c b/lib/dns/result.c
index a4aead7f06d67f74eeb454cb3a1fea9f96f971c6..cc15c507ce02f0535d4d1424cb01779e9430fe12 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.90 2001/06/08 19:37:29 bwelling Exp $ */
+/* $Id: result.c,v 1.90.2.1 2001/09/19 21:51:39 bwelling Exp $ */
 
 #include <config.h>
 
@@ -119,6 +119,8 @@ static const char *text[DNS_R_NRESULTS] = {
        "unknown protocol",                    /* 75 DNS_R_UNKNOWNPROTO      */
        "clocks are unsynchronized",           /* 76 DNS_R_CLOCKSKEW         */
        "IXFR failed"                          /* 77 DNS_R_BADIXFR           */
+       "<unused 78>",                         /* 78 unused                  */
+       "no valid KEY"                         /* 79 DNS_R_NOVALIDKEY        */
 };
 
 static const char *rcode_text[DNS_R_NRCODERESULTS] = {

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 5f10785e7d48e30837b7a968c838c2054c53742b..f6ad061ee18d7ad544d303e5f3ddb7b98f0ef7b2 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.91 2001/08/08 22:54:45 gson Exp $ */
+/* $Id: validator.c,v 1.91.2.1 2001/09/19 21:51:40 bwelling Exp $ */
 
 #include <config.h>
 
@@ -165,7 +165,7 @@ fetch_callback_validator(isc_task_t *task, isc_event_t *event) {
                validator_log(val, ISC_LOG_DEBUG(3),
                              "fetch_callback_validator: got %s",
                              dns_result_totext(eresult));
-               validator_done(val, eresult);
+               validator_done(val, DNS_R_NOVALIDKEY);
        }
 
  out:
@@ -284,7 +284,7 @@ fetch_callback_nullkey(isc_task_t *task, isc_event_t *event) {
                validator_log(val, ISC_LOG_DEBUG(3),
                              "fetch_callback_nullkey: got %s",
                              dns_result_totext(eresult));
-               validator_done(val, eresult);
+               validator_done(val, DNS_R_NOVALIDKEY);
        }
        UNLOCK(&val->lock);