]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
Handle _find_candidate_keys None return case.
authorBob Halley <halley@dnspython.org>
Sun, 19 Feb 2017 21:54:22 +0000 (13:54 -0800)
committerBob Halley <halley@dnspython.org>
Sun, 19 Feb 2017 21:54:22 +0000 (13:54 -0800)
[Issue #236]

dns/dnssec.py

index 6e9d41030ec2d376a51ffcb1dc65e52c29393f4d..f316636affac768a9969128a2af820e807c968de 100644 (file)
@@ -294,10 +294,11 @@ def _validate_rrsig(rrset, rrsig, keys, origin=None, now=None):
     if isinstance(origin, string_types):
         origin = dns.name.from_text(origin, dns.name.root)
 
-    for candidate_key in _find_candidate_keys(keys, rrsig):
-        if not candidate_key:
-            raise ValidationFailure('unknown key')
+    candidate_keys = _find_candidate_keys(keys, rrsig)
+    if candidate_keys is None:
+        raise ValidationFailure('unknown key')
 
+    for candidate_key in candidate_keys:
         # For convenience, allow the rrset to be specified as a (name,
         # rdataset) tuple as well as a proper rrset
         if isinstance(rrset, tuple):