From: Bob Halley <halley@dnspython.org>
Date: Thu, 14 Oct 2021 16:13:08 +0000 (-0700)
Subject: fix ordering issue with relative rdatas
X-Git-Tag: v2.2.0rc1~49^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e805bbf3ff34365bed632e01afe5a0d550c8467;p=thirdparty%2Fdnspython.git

fix ordering issue with relative rdatas
---

diff --git a/dns/dnssec.py b/dns/dnssec.py
index f09ecd60..6e9946f4 100644
--- a/dns/dnssec.py
+++ b/dns/dnssec.py
@@ -404,13 +404,13 @@ def _validate_rrsig(rrset, rrsig, keys, origin=None, now=None):
     rrnamebuf = rrname.to_digestable()
     rrfixed = struct.pack('!HHI', rdataset.rdtype, rdataset.rdclass,
                           rrsig.original_ttl)
-    for rr in sorted(rdataset):
+    rdatas = [rdata.to_digestable(origin) for rdata in rdataset]
+    for rdata in sorted(rdatas):
         data += rrnamebuf
         data += rrfixed
-        rrdata = rr.to_digestable(origin)
-        rrlen = struct.pack('!H', len(rrdata))
+        rrlen = struct.pack('!H', len(rdata))
         data += rrlen
-        data += rrdata
+        data += rdata
 
     chosen_hash = _make_hash(rrsig.algorithm)