summaryrefslogtreecommitdiff
path: root/lib/curl_setup.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-10-12 09:01:06 +0200
committerDaniel Stenberg <daniel@haxx.se>2016-10-31 08:46:35 +0100
commit9c91ec778104ae3b744b39444d544e82d5ee9ece (patch)
treee0473f3b118c745a1acae34f24408fa5de1436ad /lib/curl_setup.h
parent42b650b9ea5f26b2f5347af3072eaf690658ed62 (diff)
downloadcurl-9c91ec778104ae3b744b39444d544e82d5ee9ece.tar.gz
idn: switch to libidn2 use and IDNA2008 support
CVE-2016-8625 Bug: https://curl.haxx.se/docs/adv_20161102K.html Reported-by: Christian Heimes
Diffstat (limited to 'lib/curl_setup.h')
-rw-r--r--lib/curl_setup.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 5d82e339b..9619a1e66 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -599,10 +599,9 @@ int netware_init(void);
#endif
#endif
-#if defined(HAVE_LIBIDN) && defined(HAVE_TLD_H)
-/* The lib was present and the tld.h header (which is missing in libidn 0.3.X
- but we only work with libidn 0.4.1 or later) */
-#define USE_LIBIDN
+#if defined(HAVE_LIBIDN2) && defined(HAVE_IDN2_H)
+/* The lib and header are present */
+#define USE_LIBIDN2
#endif
#ifndef SIZEOF_TIME_T