From fa45182ed6b833017dde5a7cee27cdf25985790a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 31 Jan 2016 16:23:00 -0500 Subject: [PATCH] Fix hashing of TLSA packets Also add example files with TLSA and SSHFP records. --- Makefile.am | 4 +++- src/resolve/resolved-dns-rr.c | 2 +- .../test-data/_443._tcp.fedoraproject.org.pkts | Bin 0 -> 169 bytes src/resolve/test-data/kyhwana.org.pkts | Bin 0 -> 1803 bytes 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 src/resolve/test-data/_443._tcp.fedoraproject.org.pkts create mode 100644 src/resolve/test-data/kyhwana.org.pkts diff --git a/Makefile.am b/Makefile.am index 754772156c..8ab04e74ba 100644 --- 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 2803ec017e..422bbe4bc4 100644 --- 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 index 0000000000000000000000000000000000000000..a383c6286ddb0c8df381a1712723a9ff0332b411 GIT binary patch literal 169 zcmeZgfB=?w6BA>W_>$xT-n7(|{G!ByqWrAX#9?8=Pt#Joi2{GxOQ1_K6=ur(tGBLg!RGb01z{R&4n#jO{=i>rJQi-`&k zUT`Dqdz$JjS@zyqZS{oQ{kn~+${uf()bCxsd-eX(oS13#pR}XrSno;avFa&0Q>*>l zmm{=C`i>m~&!6yxf8MOP{Ao?H+CqW7uGtnZDsHBCRB64izOr!jnGCZ%hhk=C>_}yu zvqoiukjFmtjQ_^5dCZkbKf4?Yx2!#I^ZDl~qVo%zpPbuhW1+v<%$Rkqk+{({@2qf# zTp7W7#!t*k*0iUkv(yx(eyY0OpOe{@AKo=X)5G_dL&|!ym7*>V6Hdm>%TZr8&7yE( zc$n5FTMgOX&`Dy8zt(K5R9h1F;GpHU%~I2nPF}Bfy0yFUBx92M@w>9#@&tm35fV)M z6_0jA3a;HPvUVxUsVvodXJ%f}s|jHV3oX#>$u~T4X~pd6_sp%LR)2EcelJO`M905j zhWADD7e8+}T+i+5-K5%eTzA!H$+}7Bo93K%UpS?1wc*`(DbJ7T_YEcN|Ce3(=hKp| zXZfPk=UMBP_Yt0-C)eb=2WuFwQL#{3EVM9B+`DOh%(58kQ~OT}$uhbu*|uWws>=#T zwgz)$Nh<%G_I~nB@0Sx5l)p{P(^fm@z}$DT;oG_w+wLm-v|dtl-6wbEg?LxvJZ85= zIZ`r{`4^V*y-3^cSNSf9X+qJ`Qk&NnoWUE_@BOxTyY1TX8RY@9UGs|OZ1-D#|7h05 zHqVl|QtYNQo&Ua=vHb{GdngA;T`YpEUs(_)ZOTNqScfoL0b5D5e*3K^K7 z1`B`;X3NRU%TGyVPR`F|AgtU7W)f3g6*0<5Gu;?jxdz1PINUCX5h#QmZ-Q(*VdbXC z%B8Wo23Tq^FlgyBu&n)mu2T)G5`Ji418G>;fuqX;t7-wLYDI-I+v0*WLxtQ5g+!~8 zk|I55*`)_8yA*U2b8=$w>UVPmCb^`<;#A$@%#u{yvecr?w9MqhlFa-(Td#_coTB(# zXa5uzvjWe&f-o;rH(x)?u*mY9eAkLZ*Zk1X5WmpUfQpQ4?13Z$^|gQ+gALdfA8aQ6 z|2IuV%@V7dbfA7xVq}^yPqbyp3Gw~EEB;D_`yb-q{^N80Q-{a7%Dxbv>q}>?)x~Ro z7!#vkb5Xo<{=})8E9*X|O=kPME&W{;0b7}v{?EyOC0!g8zx$<>vf$mCCAP=cyqI8p z%&tW9-i&?Ghnxu5%FH;mW*yI$&@{26WhH0VZ@9Dh$lYJB3E0Za^eKQnhEMZwyIi%^ zt-Bv=X6)P6tob;mU1dq!A;Wq9J^vA~m65S*%DE*QI$P&vylq+iIIzyV*`C!Ed#Xt$ HI@JIG&1O3A literal 0 HcmV?d00001