diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:57:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-30 12:57:50 +0200 |
| commit | 2d43ae806359c89818c0519d81a65ded768746d8 (patch) | |
| tree | c5ca4144a8f721efb0b4d051ee604f2694e6df64 /external/unbound/sldns | |
| parent | no longer need to pass the size to rapidjson (diff) | |
| download | monero-2d43ae806359c89818c0519d81a65ded768746d8.tar.xz | |
update unbound, fix unbound openssl issue on OS X
Diffstat (limited to 'external/unbound/sldns')
| -rw-r--r-- | external/unbound/sldns/parseutil.h | 4 | ||||
| -rw-r--r-- | external/unbound/sldns/rrdef.h | 2 | ||||
| -rw-r--r-- | external/unbound/sldns/wire2str.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/external/unbound/sldns/parseutil.h b/external/unbound/sldns/parseutil.h index dfa1c2a2b..c5238bc10 100644 --- a/external/unbound/sldns/parseutil.h +++ b/external/unbound/sldns/parseutil.h @@ -56,13 +56,13 @@ time_t sldns_mktime_from_utc(const struct tm *tm); /** * The function interprets time as the number of seconds since epoch - * with respect to now using serial arithmitics (rfc1982). + * with respect to now using serial arithmetics (rfc1982). * That number of seconds is then converted to broken-out time information. * This is especially usefull when converting the inception and expiration * fields of RRSIG records. * * \param[in] time number of seconds since epoch (midnight, January 1st, 1970) - * to be intepreted as a serial arithmitics number relative to now. + * to be intepreted as a serial arithmetics number relative to now. * \param[in] now number of seconds since epoch (midnight, January 1st, 1970) * to which the time value is compared to determine the final value. * \param[out] result the struct with the broken-out time information diff --git a/external/unbound/sldns/rrdef.h b/external/unbound/sldns/rrdef.h index 678d2bc79..ab65943a5 100644 --- a/external/unbound/sldns/rrdef.h +++ b/external/unbound/sldns/rrdef.h @@ -342,7 +342,7 @@ enum sldns_enum_rdf_type /** A <character-string> encoding of the value field as specified * [RFC1035], Section 5.1., encoded as remaining rdata. - * For CAA. + * For CAA, URI. */ LDNS_RDF_TYPE_LONG_STR, diff --git a/external/unbound/sldns/wire2str.c b/external/unbound/sldns/wire2str.c index cec3bc7b0..5cbd78eed 100644 --- a/external/unbound/sldns/wire2str.c +++ b/external/unbound/sldns/wire2str.c @@ -697,6 +697,9 @@ int sldns_wire2str_rdata_scan(uint8_t** d, size_t* dlen, char** s, } w += n; } + if(*dlen != 0) { + goto failed; + } return w; } |