Commit bc9db4a3 authored by Marek Vavrusa's avatar Marek Vavrusa

Merge branch 'master' into packet-api-rewrite

parents 42e36fc5 51f3f443
......@@ -19,6 +19,8 @@
/src/tests/Makefile.in
/src/zscanner/Makefile
/src/zscanner/Makefile.in
/patches/Makefile
/patches/Makefile.in
/samples/Makefile
/samples/Makefile.in
/doc/Makefile
......
......@@ -999,22 +999,25 @@ static int semantic_checks_dnssec(knot_zone_contents_t *zone,
const knot_dname_t *next_domain =
knot_rdata_nsec_next(nsec_rrset, 0);
assert(next_domain);
// Convert name to lowercase for trie lookup
knot_dname_t *lowercase = knot_dname_copy(next_domain);
if (lowercase == NULL) {
return KNOT_ENOMEM;
}
knot_dname_to_lower(lowercase);
if (knot_zone_contents_find_node(zone,
next_domain) ==
NULL) {
err_handler_handle_error(handler,
node,
if (knot_zone_contents_find_node(zone, lowercase) == NULL) {
err_handler_handle_error(handler, node,
ZC_ERR_NSEC_RDATA_CHAIN, NULL);
}
if (knot_dname_cmp(next_domain,
if (knot_dname_cmp(lowercase,
knot_node_owner(knot_zone_contents_apex(zone)))
== 0) {
/* saving the last node */
*last_node = node;
}
knot_dname_free(&lowercase);
}
} else if (nsec3 && (auth || deleg)) { /* nsec3 */
int ret = check_nsec3_node_in_zone(zone, node,
......
$ORIGIN rdatacase.
$TTL 3600
@ SOA dns1 hostmaster 2010111201 10800 3600 1209600 7200
NS dns1
NS dns2
MX 10 mail
dns1 A 192.0.2.1
AAAA 2001:DB8::1
dns2 A 192.0.2.2
AAAA 2001:DB8::2
mail A 192.0.2.3
AAAA 2001:DB8::3
ALL A 1.1.1.1
sOmE A 2.2.2.2
\ No newline at end of file
; File written on Thu Jan 23 14:54:39 2014
; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1.1
rdatacase. 3600 IN SOA dns1.rdatacase. hostmaster.rdatacase. 2010111201 10800 3600 1209600 7200
rdatacase. 3600 IN RRSIG SOA 5 1 3600 20500101000000 20140123125439 62775 rdatacase. CG1Qm7ZPHZd0EyrMemOTGhKvzco71mEZJvReD/qp/Pdy723LuJbTI9yV lncG1CLb6Hca3es6nLjSjzlIyfofQ1xPfy4AtMfWjMq68GA8x4c0PWlY 5xmSKyG+HApcrmfjd9xBfLEUk18eLRm6L/NVCA40E0vWWZnqU5iPAXJl yMs=
rdatacase. 3600 IN NS dns1.rdatacase.
rdatacase. 3600 IN NS dns2.rdatacase.
rdatacase. 3600 IN RRSIG NS 5 1 3600 20500101000000 20140123125439 62775 rdatacase. IVTyd3q8Id88lW/pzFqBoIq2os+fJJWC3DJBXfWKAUQLIo8Rd4s2/GkL XPeRN3xbkurDrhGckiljOFids9E3cZVPvSJUk1fsXIBX+0GhtJgkrFmq BnsPrU7ALjyaWl/OrZI8FxTBzLu04igYxoYg/6QhmqH9XkcNSVtRbIY4 XWA=
rdatacase. 3600 IN MX 10 mail.rdatacase.
rdatacase. 3600 IN RRSIG MX 5 1 3600 20500101000000 20140123125439 62775 rdatacase. FoYKWYfMOxeBYHjMLea4IGT7pybqBFKBU1epclB23nXsDzbrfVQUHzQy xOoTmqGB1VYp4MIsEPjFKozcGcSfDeBSdlp5uT1SgAREpMLkrSFhJRr2 AYLnKtoVnZjSA7Al3Y7rCxIExjXAC8Cjy5yKdDCb8fr4fvNOQIdIOijm q6A=
rdatacase. 7200 IN NSEC ALL.rdatacase. NS SOA MX RRSIG NSEC DNSKEY
rdatacase. 7200 IN RRSIG NSEC 5 1 7200 20500101000000 20140123125439 62775 rdatacase. Vq4vLB0hpLzpmYW6ostkwcFgeXStZ2ddulCyycFGFy0LibuGQj3uaPp2 xm3M08U2+yekJ99Xqlp43jcnAV6Vt2i7rctornhC8lDjXGKagpM4UOB7 X1Aobp85QGYfrK3+pzRFYggEtZzTVhtBrvTEaNKNAbZyzamuQ+zNl7lf ygo=
rdatacase. 3600 IN DNSKEY 256 3 5 AwEAAZ6AAN4ZMcV/lWIlhSGWcAWRt8nXi9w1mnh1qWbW/OTYyhT8Z104 xJVjtBKGkU2R626eRM6moyFc2Pu6EWpXZHdF74j6rdwSoLSM0cv8uh9A TqjL03xkzNEmnBkfl7hn5mfQQgBz/DmPMiv1Mqfw8iFJUP+CAthmzoIO 2Akut6EB
rdatacase. 3600 IN DNSKEY 257 3 5 AwEAAcNEQzcaYunZ6uYd7VenjaPd/Uf83PHvkCsn/E+MD1DZZ19PL/zA eQ3EdYSnBS3ppuZx3XDVSq56iF/q0J1G0bfWN46lwrLFy/GWkrQJEWSV 4AxmvDmnvBkKdprTKRw78cR/0BBzzbXdAAwT7a1yqMhce8/jsJdN6Sdy sepFOqWqzgdOdGr8gCOe9MGbId3e2VHCBkHgfIgdPCdwy31NAMkdF7fa S6z/08GNQIoHoQA+mlAQMpFeQ6GY6xK0Il3Xf8k1MoHE0hOYf+Ql2/Xj avRQnERkLplJrA/eFER84FifjWSCNyAmh3iTttK0q0VVdpkwtvVARbnn 3lTN5K3r3VE=
rdatacase. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140123125439 59491 rdatacase. POK+ybMEpGS6fGiHF15fNrCnuUyObYWh5YVZcSUGMEj0MECChU3iiF6y tZSUWPW8mBpqifYGVF5c4t/IGWgIG4B/EMRQT8WhNZroyYe825mZ0zNp vLE0VCw/QY7G0A6zLbnokLNPPVovJWdgOlZ1A/qQhC4FkZPDXYQy/Btl Vkzv2n3ABltybWOnmYCzBDo0Wp380uf0PUYO4H/k/hLomVRss+3rcS4q CnrR+/OrVVZZG59mcDXwouv+isuw22wX7SAtuLPTaoh4TuSs0tmx7zMO R9H2dWG2XY291vO0Fvuj8v+OEhUclFYiXTMjZnS7aVxykUsztNzGhPwQ z/RzVA==
rdatacase. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20140123125439 62775 rdatacase. VISTnM+7LSVYIC3qzbUes1vr16iwZsu6QWHjJ+dP5edco0NIqpnv4Hj8 DlZYXtNoBZzErKE9iOJzBZ5iqOIt2b50ZAoHGKggtn/bzqSiQoeeYL6O bFQC5GKdQ7sH5L9WRDpjBrVUXa2kMDAtEju/KP60U7cudGKpPIWGzEWK kOM=
ALL.rdatacase. 3600 IN A 1.1.1.1
ALL.rdatacase. 3600 IN RRSIG A 5 2 3600 20500101000000 20140123125439 62775 rdatacase. b0AqaH4bX6zsPmv8uVExT4H/R6opnMbOrqrt+rgtql6z1TvlNikoTBPJ nq3bMDZ0auHlNmpBmJa/xXvIhnddAMyVDtSfIj+x4bjGZaYhoLylBU2N nmxrs+zqKeGfHz77+gAHh6QKoSW5F1aHihWkZy8Xz46WDHXcB+Mspk+T H+Y=
ALL.rdatacase. 7200 IN NSEC dns1.rdatacase. A RRSIG NSEC
ALL.rdatacase. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140123125439 62775 rdatacase. Jn4vBCJvVK3o8fCn7tSlX8xjx4/m5INkC6ANkZgpNLzzIa2dKYCMnd4+ yoehYXLt690vmzLhmwsGw0wD9W3LhHLLSGgItqhp5351JhvA82l0NlD5 tVgLw9u5YEe32Z7O4SK8j7keJn2BdpiCFq674qRwvMAYu2HVwkuNLeb4 GeY=
dns1.rdatacase. 3600 IN A 192.0.2.1
dns1.rdatacase. 3600 IN RRSIG A 5 2 3600 20500101000000 20140123125439 62775 rdatacase. MJGV9FLKQlJKGu65VLWDdLMMWxBiwhMFvwwV9uP/YDyWUsrfpfeJShqB xQ46wLDFSVk9Us5C1072cJSyPzoLPAIAXsP3Fc0UTkKan7TQLw1eb+Zh QITWnWY5mUhhWpyrFuvBRsAMGxCgUdFI+a/Bp2I+jJI+J/eOhg15P5kn qFI=
dns1.rdatacase. 3600 IN AAAA 2001:db8::1
dns1.rdatacase. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140123125439 62775 rdatacase. JouuYPsAky2s5shrTZuTXg1ALPpe9+HZKyOD/8c2VnhHrASRwrfbWRqk 8GL4qLRSmRYWU39GsIn7O3ABgDcbHg7ST/xQMpkXTPqkYZA9/IzB2GUg P4EQVo/5PAyOJqlxGAcAf66mhecP4B6qU3MzpZe012MDikGs1u8OTFHy +EQ=
dns1.rdatacase. 7200 IN NSEC dns2.rdatacase. A AAAA RRSIG NSEC
dns1.rdatacase. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140123125439 62775 rdatacase. D0l5mCaPtsfAFBewCbOKHq1+oEhyzxf97uT0wWUBZRXDJk5RIHaajEOI WzTqa5oDTYkj7v/LMR/3eRlquGYtTX6ZNgOeCInEQYpNlHgRLoXVw4G3 SccdIcrEhYLZe8/S5lv9gGWDARDI1D2KL5VHD3nos6HXGbMBQoEujj4R rQs=
dns2.rdatacase. 3600 IN A 192.0.2.2
dns2.rdatacase. 3600 IN RRSIG A 5 2 3600 20500101000000 20140123125439 62775 rdatacase. X5Py3ID28An0XkruZ9Mf7jNRlW2OKvTdorrGyUlTGu88CPPg/FaCw/t8 buJvF54XwEpDD5zg5FI20b5CUgto1ZJYdUUSjUXk0d4XJNQE+Y8RrWzp 4yBPtWjVSaRQu3msgLroqDy59JxDJzixW6GztcABr4Z2Dhgl6VmLP3mc d8Y=
dns2.rdatacase. 3600 IN AAAA 2001:db8::2
dns2.rdatacase. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140123125439 62775 rdatacase. h3uaHQ9MR+Ix00oU373HqRMrqKigSpnqd30LJ6ytFmQtFxZ4QBZ4vuGd J5a6bSvwo6kQg5nhnPCCeK3L2A4xh2D6deVy089P1XvOxogZvX1N/J4P iUD545z4cSDNdRlD/P97BCtHBKyGCzduCfwoLLr+7uM2wyEok3/SIbVr bmA=
dns2.rdatacase. 7200 IN NSEC mail.rdatacase. A AAAA RRSIG NSEC
dns2.rdatacase. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140123125439 62775 rdatacase. Al2wkXw/LreVKagnl7G1ZQrvQ29+UPaDtD3xvcI0GugQdhrgPFBjK38Q 7C4nBtoStF/jJP1WH08/6Riya3XT+L2NLpBxK+uVJmC+dqhDKAUBq0ry hCDbWlAatLDgyVjHeoLy8ybRJrK08/CdxR//WBI7jNIMD8SDVoOA74vY 78I=
sOmE.rdatacase. 3600 IN A 2.2.2.2
sOmE.rdatacase. 3600 IN RRSIG A 5 2 3600 20500101000000 20140123125439 62775 rdatacase. Csp/B5c/VaqlLTHXSu9ROmiRGFB5NF4ZJf3KiDfNPFuH9vh4Oqxpzw/4 V5HavzUz2XG9WQAgPgXBONezr6WHdavENeFXO8ZSX/SwWfnQ/qV9yb1S hLibWHtp5qj4UIMaVMEQIz7QZaAi7hAqW2NFlTStlL9tSwXMFHI0ApjG EKo=
sOmE.rdatacase. 7200 IN NSEC rdatacase. A RRSIG NSEC
sOmE.rdatacase. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140123125439 62775 rdatacase. C13dgKqzpFI1FWiE+495bTVi0XH8oSRYPZgVC7APtxV2Kiwz4c8JnOzS vhMHOJu/lvX6fkdzyTfWaQ+72lysIp8JU02NH923E7iUb/A4pzatUxoN v9iNyLVYoR98vph++HbBFYeDJ8uOP8zxBVVh/KjpG96zJUxAkTGJiLG1 iME=
mail.rdatacase. 3600 IN A 192.0.2.3
mail.rdatacase. 3600 IN RRSIG A 5 2 3600 20500101000000 20140123125439 62775 rdatacase. kTLXoPTEVi88k5hVmh2YtnX8PI9/W0tqwZjj+t36sl0DEd5dlRhtdMsP 3ltNl1uxHKtc38LC+e3dZgR48ppiW5ZpE0A8NUc3L3mTxhw74X6HOzVC zRCX408PpK0s4KcO3JLSdFgY9mMZIAtwTSkxAeDOD6AcszQe0oeGiQfD iAQ=
mail.rdatacase. 3600 IN AAAA 2001:db8::3
mail.rdatacase. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20140123125439 62775 rdatacase. gbYJlFWF86ueryCpdbFLcgv3HT3MtmXHNC7l7oi7jbd2dErR+7rS8WHI K4dWAAUgmmwEMKvXZrfKzRI1KOfAHFugXt7H6PaQ5Zx8K++qeynL4ysx ilE9n/l297bdmmRdww8843BDhl9dljqcZ4PdQBlop6do1VFomDIV4ATA 2U0=
mail.rdatacase. 7200 IN NSEC sOmE.rdatacase. A AAAA RRSIG NSEC
mail.rdatacase. 7200 IN RRSIG NSEC 5 2 7200 20500101000000 20140123125439 62775 rdatacase. Ep6HbV9/X58sQS8oFJLLTrYXK5O1YWd6LCD1PTWOuH5xXxRCEWXn2VLe 2G4+81eddMghAKI1KYx145KNeoUqoYE6Y1h35Gy0h3faNuLlUWcJUa8e JWTwXte22uVSCXQ40sm9CLrgrcZaIlbbRpWKkn4BBBQKS9i9m0PPLyKq RFA=
#!/bin/sh
export BASEDIR=`mktemp -d "/tmp/zone_sign-XXX"`
../../../../tools/zone_sign.sh rdatacase. ./rdatacase.zone nsec
#!/usr/bin/env python3
'''Test for loading of NSEC records with upper-case letters in rdata.'''
from dnstest.test import Test
t = Test()
knot = t.server("knot")
bind = t.server("bind")
zone = t.zone("rdatacase.", "rdatacase.zone.signed", local=True)
t.link(zone, knot)
t.link(zone, bind)
t.start()
knot.zones_wait(zone)
bind.zones_wait(zone)
t.xfr_diff(knot, bind, zone)
t.end()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment