Fix hashing of TLSA packets

Also add example files with TLSA and SSHFP records.

diff --git a/Makefile.am b/Makefile.am
index 754772156cde7fa8526d27670344f3abc4b4a422..8ab04e74bac6f384ae3334261950b5c98bb1385b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5324,7 +5324,9 @@ EXTRA_DIST += \
        src/resolve/test-data/root.pkts \
        src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \
        src/resolve/test-data/teamits.com.pkts \
-       src/resolve/test-data/zbyszek@fedoraproject.org.pkts
+       src/resolve/test-data/zbyszek@fedoraproject.org.pkts \
+       src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \
+       src/resolve/test-data/kyhwana.org.pkts
 
 test_dnssec_SOURCES = \
        src/resolve/test-dnssec.c \

diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 2803ec017ef8fe3d3e3f5ceb4ad4745e5646dd4f..422bbe4bc413d091a81d5e1486b5474ade867b29 100644 (file)
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -1429,7 +1429,7 @@ void dns_resource_record_hash_func(const void *i, struct siphash *state) {
                 siphash24_compress(&rr->tlsa.cert_usage, sizeof(rr->tlsa.cert_usage), state);
                 siphash24_compress(&rr->tlsa.selector, sizeof(rr->tlsa.selector), state);
                 siphash24_compress(&rr->tlsa.matching_type, sizeof(rr->tlsa.matching_type), state);
-                siphash24_compress(&rr->tlsa.data, rr->tlsa.data_size, state);
+                siphash24_compress(rr->tlsa.data, rr->tlsa.data_size, state);
                 break;
 
         case DNS_TYPE_OPENPGPKEY:

diff --git a/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts b/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts
new file mode 100644 (file)
index 0000000..a383c62
Binary files /dev/null and b/src/resolve/test-data/_443._tcp.fedoraproject.org.pkts differ

diff --git a/src/resolve/test-data/kyhwana.org.pkts b/src/resolve/test-data/kyhwana.org.pkts
new file mode 100644 (file)
index 0000000..e28a725
Binary files /dev/null and b/src/resolve/test-data/kyhwana.org.pkts differ