Skip to content

Commit a914b23

Browse files
BethGriggsBethGriggs
committed
deps: apply missed updates from c-ares 1.17.1
PR-URL: #39653 Refs: c-ares/c-ares#349 Refs: #36207 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 6c7fff6 commit a914b23

File tree

3 files changed

+69
-62
lines changed

3 files changed

+69
-62
lines changed

Diff for: ‎deps/cares/src/README.msvc

+2-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
___ __ _ _ __ ___ ___
3+
___ __ _ _ __ ___ ___
44
/ __| ___ / _` | '__/ _ \/ __|
55
| (_ |___| (_| | | | __/\__ \
66
\___| \__,_|_| \___||___/
@@ -64,46 +64,6 @@
6464
to c-ares source folder where Makefile.msvc file is located.
6565

6666

67-
How to build using Visual Studio 6 IDE
68-
--------------------------------------
69-
70-
A VC++ 6.0 reference workspace (vc6aws.dsw) is available within the 'vc'
71-
folder to allow proper building of the library and sample programs.
72-
73-
1) Open the vc6aws.dsw workspace with MSVC6's IDE.
74-
2) Select 'Build' from top menu.
75-
3) Select 'Batch Build' from dropdown menu.
76-
4) Make sure that the sixteen project configurations are 'checked'.
77-
5) Click on the 'Build' button.
78-
6) Once the sixteen project configurations are built you are done.
79-
80-
Dynamic and static c-ares libraries are built in debug and release flavours,
81-
and can be located each one in its own subdirectory, dll-debug, dll-release,
82-
lib-debug and lib-release, all of them below the 'vc\cares' subdirectory.
83-
84-
In the same way four executable versions of each sample program are built,
85-
each using its respective library. The resulting sample executables are
86-
located in its own subdirectory, dll-debug, dll-release, lib-debug and
87-
lib-release, below the 'vc\acountry', 'vc\adig' and 'vc\ahost'folders.
88-
89-
These reference VC++ 6.0 configurations are generated using the dynamic CRT.
90-
91-
92-
How to build using Visual Studio 2003 or newer IDE
93-
--------------------------------------------------
94-
95-
First you have to convert the VC++ 6.0 reference workspace and project files
96-
to the Visual Studio IDE version you are using, following next steps:
97-
98-
1) Open vc\vc6aws.dsw with VS20XX.
99-
2) Allow VS20XX to update all projects and workspaces.
100-
3) Save ALL and close VS20XX.
101-
4) Open vc\vc6aws.sln with VS20XX.
102-
5) Select batch build, check 'all' projects and click 'build' button.
103-
104-
Same comments relative to generated files and folders as done above for
105-
Visual Studio 6 IDE apply here.
106-
10767

10868
Relationship between c-ares library file names and versions
10969
-----------------------------------------------------------
@@ -139,4 +99,4 @@
13999

140100

141101
Have Fun!
142-
102+

Diff for: ‎deps/cares/src/RELEASE-NOTES

+58-20
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,68 @@
1-
c-ares version 1.16.1
1+
c-ares version 1.17.1
2+
3+
Due to a packaging issue with 1.17.0, we have released 1.17.1 to address that
4+
issue. See 1.17.0 release notes below..
5+
6+
7+
c-ares version 1.17.0
28

39
Security:
4-
o Prevent possible use-after-free and double-free in ares_getaddrinfo() if
5-
ares_destroy() is called prior to ares_getaddrinfo() completing. Reported
6-
by Jann Horn at Google Project Zero.
10+
o avoid read-heap-buffer-overflow in ares_parse_soa_reply found during
11+
fuzzing [2] [3]
12+
o Avoid theoretical buffer overflow in RC4 loop comparison [5]
13+
o Empty hquery->name could lead to invalid memory access [15]
14+
o ares_parse_{a,aaaa}_reply() could return a larger *naddrttls than was
15+
passed in [17]
716

817
Changes:
9-
o Allow TXT records on CHAOS qclass. Used for retriving things like
10-
version.bind, version.server, authoris.bind, hostname.bind, and id.server.
11-
[3]
18+
o Update help information for adig, acountry, and ahost [4]
19+
o Test Suite now uses dynamic system-assigned ports rather than hardcoded
20+
ports to prevent failures in containers [10]
21+
o Detect remote DNS server does not support EDNS using rules from RFC 6891 [12]
22+
o Source tree has been reorganized to use a more modern layout [13]
23+
o Allow parsing of CAA Resource Record [14]
1224

1325
Bug fixes:
14-
o Fix Windows Unicode incompatibilities with ares_getaddrinfo() [1]
15-
o Silence false cast-align compiler warnings due to valid casts of
16-
struct sockaddr to struct sockaddr_in and struct sockaddr_in6.
17-
o MacOS should use libresolv for retrieving DNS servers, like iOS
18-
o CMake build system should populate the INCLUDE_DIRECTORIES property of
19-
installed targets [2]
20-
o Correct macros in use for the ares_getaddrinfo.3 man page
26+
o readaddrinfo bad sizeof() [1]
27+
o Test cases should honor HAVE_WRITEV flag, not depend on WIN32 [6]
28+
o FQDN with trailing period should be queried first [7]
29+
o ares_getaddrinfo() was returning members of the struct as garbage values if
30+
unset, and was not honoring ai_socktype and ai_protocol hints. [8] [9]
31+
o ares_gethostbyname() with AF_UNSPEC and an ip address would fail [11]
32+
o Properly document ares_set_local_ip4() uses host byte order [16]
2133

2234
Thanks go to these friendly people for their efforts and contributions:
23-
Brad House (@bradh352), Daniel Stenberg (@bagder), Dmitry Igrishin (@dmitigr),
24-
Jann Horn, Shelly Vohr, Teemu R (@rytilahti)
25-
(6 contributors)
35+
@anonymoushelpishere
36+
Anthony Penniston (@apenn-msft)
37+
Brad House (@bradh352)
38+
Bulat Gaifullin (@bgaifullin)
39+
Daniela Sonnenschein (@lxdicted)
40+
Daniel Stenberg (@bagder)
41+
David Hotham (@dimbleby)
42+
Fionn Fitzmaurice (@fionn)
43+
Gisle Vanem (@gavenm)
44+
Ivan Baidakou (@basiliscos)
45+
Jonathan Maye-Hobbs (@wheelpharoah)
46+
Łukasz Marszał (@lmarszal)
47+
lutianxiong (@ltx2018)
48+
Seraphime Kirkovski (@Seraphime)
49+
(14 contributors)
2650

2751
References to bug reports and discussions on issues:
28-
[1] = https://github.com/c-ares/c-ares/pull/328
29-
[2] = https://github.com/c-ares/c-ares/pull/323
30-
[3] = https://github.com/c-ares/c-ares/pull/321
52+
[1] = https://github.com/c-ares/c-ares/pull/331
53+
[2] = https://github.com/c-ares/c-ares/pull/332
54+
[3] = https://github.com/c-ares/c-ares/issues/333
55+
[4] = https://github.com/c-ares/c-ares/pull/334
56+
[5] = https://github.com/c-ares/c-ares/pull/336
57+
[6] = https://github.com/c-ares/c-ares/pull/344
58+
[7] = https://github.com/c-ares/c-ares/pull/345
59+
[8] = https://github.com/c-ares/c-ares/issues/343
60+
[9] = https://github.com/c-ares/c-ares/issues/317
61+
[10] = https://github.com/c-ares/c-ares/pull/346
62+
[11] = https://github.com/c-ares/c-ares/pull/204
63+
[12] = https://github.com/c-ares/c-ares/pull/244
64+
[13] = https://github.com/c-ares/c-ares/pull/349
65+
[14] = https://github.com/c-ares/c-ares/pull/360
66+
[15] = https://github.com/c-ares/c-ares/pull/367
67+
[16] = https://github.com/c-ares/c-ares/pull/368
68+
[17] = https://github.com/c-ares/c-ares/issues/371

Diff for: ‎deps/cares/src/ares_dns.h

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616
* without express or implied warranty.
1717
*/
1818

19+
/*
20+
* NOTE TO INTEGRATORS:
21+
*
22+
* This header is made public due to legacy projects relying on it.
23+
* Please do not use the macros within this header, or include this
24+
* header in your project as it may be removed in the future.
25+
*/
26+
27+
1928
/*
2029
* Macro DNS__16BIT reads a network short (16 bit) given in network
2130
* byte order, and returns its value as an unsigned short.

0 commit comments

Comments
 (0)