upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-23 16:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix sldns wire2str printout of RR type CAA tags.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4142 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-05-02 12:05:10 +00:00
parent 3018dc636a
commit 4770bfbb5b
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
2 May 2017: Wouter 2 May 2017: Wouter
- Added test for leak of stub information. - Added test for leak of stub information.
- Fix sldns wire2str printout of RR type CAA tags.
1 May 2017: Wouter 1 May 2017: Wouter
- Fix #1259: "--disable-ecdsa" argument overwritten - Fix #1259: "--disable-ecdsa" argument overwritten

4
sldns/wire2str.c
View file

@ -1639,10 +1639,10 @@ int sldns_wire2str_tag_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
if(*dl < 1+n) if(*dl < 1+n)
return -1; return -1;
for(i=0; i<n; i++) for(i=0; i<n; i++)
if(!isalnum((unsigned char)(*d)[i])) if(!isalnum((unsigned char)(*d)[i+1]))
return -1; return -1;
for(i=0; i<n; i++) for(i=0; i<n; i++)
w += sldns_str_print(s, sl, "%c", (char)(*d)[i]); w += sldns_str_print(s, sl, "%c", (char)(*d)[i+1]);
(*d)+=n+1; (*d)+=n+1;
(*dl)-=(n+1); (*dl)-=(n+1);
return w; return w;

14
testdata/test_ldnsrr.c5 vendored
View file

@ -111,19 +111,19 @@ host1.blaat.nl. 3600 IN L64 10 2001:0db8:1140:1000
05686F73743105626C616174026E6C00006B000100000E100018000A0B6C36342D7375626E65743105626C616174026E6C00 05686F73743105626C616174026E6C00006B000100000E100018000A0B6C36342D7375626E65743105626C616174026E6C00
host1.blaat.nl. 3600 IN LP 10 l64-subnet1.blaat.nl. host1.blaat.nl. 3600 IN LP 10 l64-subnet1.blaat.nl.
03636161000101000100000E1000150005697373756563612E6578616D706C652E6E6574 03636161000101000100000E1000150005697373756563612E6578616D706C652E6E6574
caa. 3600 IN CAA \# 21 0005697373756563612E6578616D706C652E6E6574 caa. 3600 IN CAA 0 issue "ca.example.net"
03636161000101000100000E1000220005696F6465666D61696C746F3A7365637572697479406578616D706C652E636F6D 03636161000101000100000E1000220005696F6465666D61696C746F3A7365637572697479406578616D706C652E636F6D
caa. 3600 IN CAA \# 34 0005696F6465666D61696C746F3A7365637572697479406578616D706C652E636F6D caa. 3600 IN CAA 0 iodef "mailto:security@example.com"
03636161000101000100000E1000200005696F646566687474703A2F2F696F6465662E6578616D706C652E636F6D2F 03636161000101000100000E1000200005696F646566687474703A2F2F696F6465662E6578616D706C652E636F6D2F
caa. 3600 IN CAA \# 32 0005696F646566687474703A2F2F696F6465662E6578616D706C652E636F6D2F caa. 3600 IN CAA 0 iodef "http://iodef.example.com/"
03636161000101000100000E1000250005697373756563612E6578616D706C652E6E65743B206163636F756E743D323330313233 03636161000101000100000E1000250005697373756563612E6578616D706C652E6E65743B206163636F756E743D323330313233
caa. 3600 IN CAA \# 37 0005697373756563612E6578616D706C652E6E65743B206163636F756E743D323330313233 caa. 3600 IN CAA 0 issue "ca.example.net; account=230123"
03636161000101000100000E1000200005697373756563612E6578616D706C652E6E65743B20706F6C6963793D6576 03636161000101000100000E1000200005697373756563612E6578616D706C652E6E65743B20706F6C6963793D6576
caa. 3600 IN CAA \# 32 0005697373756563612E6578616D706C652E6E65743B20706F6C6963793D6576 caa. 3600 IN CAA 0 issue "ca.example.net; policy=ev"
03636161000101000100000E10000C8003746273556E6B6E6F776E 03636161000101000100000E10000C8003746273556E6B6E6F776E
caa. 3600 IN CAA \# 12 8003746273556E6B6E6F776E caa. 3600 IN CAA 128 tbs "Unknown"
03636161000101000100000E100046020461757468303E3039060A2B06010401D67902030106096086480165030402010420614829C81B958911F81164D40DCDBFD49D66CEB3B3442FF6C9C3A912F9497566020100 03636161000101000100000E100046020461757468303E3039060A2B06010401D67902030106096086480165030402010420614829C81B958911F81164D40DCDBFD49D66CEB3B3442FF6C9C3A912F9497566020100
caa. 3600 IN CAA \# 70 020461757468303E3039060A2B06010401D67902030106096086480165030402010420614829C81B958911F81164D40DCDBFD49D66CEB3B3442FF6C9C3A912F9497566020100 caa. 3600 IN CAA 2 auth "0>09\006\010+\006\001\004\001\214y\002\003\001\006 `\134H\001e\003\004\002\001\004 aH)\200\027\149\137\017\248\017d\212\013\205\191\212\157f\206\179\179D/\246\201\195\169\018\249Iuf\002\001\000"
05657569343800006C000100000E10000600005E90012A 05657569343800006C000100000E10000600005E90012A
eui48. 3600 IN EUI48 00-00-5e-90-01-2a eui48. 3600 IN EUI48 00-00-5e-90-01-2a
05657569363400006D000100000E10000800005EEF0000002A 05657569363400006D000100000E10000800005EEF0000002A