upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'matthijs-lexopt-escape-public-key-9.18' into 'bind-9.18'

Browse source 
[9.18] Recognize escapes when reading the public key

See merge request isc-projects/bind9!8504
This commit is contained in:
Matthijs Mekking 2023-11-20 12:40:43 +00:00
commit 144c7d0d9d
5 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6287. [bug] Recognize escapes when reading the public key from file.
[GL !8502]
6286. [bug] Dig +yaml will now report "no servers could be reached"
on TCP connection failure as well as for UDP timeouts.
[GL #4396]

9
bin/tests/system/kasp/ns3/named-fips.conf.in
View file

@ -49,6 +49,15 @@ zone "default.kasp" {
dnssec-policy "default";
};
/* A zone with special characters. */
zone "i-am.\":\;?&[]\@!\$*+,|=\.\(\)special.kasp." {
type primary;
file "i-am.special.kasp.db";
check-names ignore;
inline-signing yes;
dnssec-policy "default";
};
/* checkds: Zone with one KSK. */
zone "checkds-ksk.kasp" {
type primary;

7
bin/tests/system/kasp/ns3/setup.sh
View file

@ -51,6 +51,13 @@ for zn in default dnssec-keygen some-keys legacy-keys pregenerated \
cp template.db.in "$zonefile"
done
#
# Setup special zone
#
zone="i-am.\":\;?&[]\@!\$*+,|=\.\(\)special.kasp."
echo_i "setting up zone: $zone"
cp template.db.in "i-am.special.kasp.db"
#
# Set up RSASHA1 based zones
#

10
bin/tests/system/kasp/tests.sh
View file

@ -393,6 +393,16 @@ check_apex
check_subdomain
dnssec_verify
#
# A zone with special characters.
#
set_zone "i-am.\":\;?&[]\@!\$*+,|=\.\(\)special.kasp."
set_policy "default" "1" "3600"
set_server "ns3" "10.53.0.3"
# It is non-trivial to adapt the tests to deal with all possible different
# escaping characters, so we will just try to verify the zone.
dnssec_verify
#
# Zone: dynamic.kasp
#

2
lib/dns/dst_api.c
View file

@ -1647,7 +1647,7 @@ dst_key_read_public(const char *filename, int type, isc_mem_t *mctx,
isc_token_t token;
isc_result_t ret;
dns_rdata_t rdata = DNS_RDATA_INIT;
unsigned int opt = ISC_LEXOPT_DNSMULTILINE;
unsigned int opt = ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE;
dns_rdataclass_t rdclass = dns_rdataclass_in;
isc_lexspecials_t specials;
uint32_t ttl = 0;