about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-05-23 15:26:19 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-05-23 15:27:24 +0200
commit7f9f1ecb710eac4d65bb02785ddf288cac098323 (patch)
treeb93086996bfb5edf0221b895128ef5a6e709dead /include
parent5f7b841d3aebdccc2baed27cb4b22ddb08cd7c0c (diff)
downloadglibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.tar.gz
glibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.tar.xz
glibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.zip
Switch IDNA implementation to libidn2 [BZ #19728] [BZ #19729] [BZ #22247]
This provides an implementation of the IDNA2008 standard and fixes
CVE-2016-6261, CVE-2016-6263, CVE-2017-14062.
Diffstat (limited to 'include')
-rw-r--r--include/dlfcn.h2
-rw-r--r--include/idna.h8
2 files changed, 1 insertions, 9 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 694e71c83b..c231309083 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -46,7 +46,7 @@ extern char **__libc_argv attribute_hidden;
 
    The use of RTLD_NOW also impacts gconv module loading, backtracing
    (where the unwinder form libgcc_s.so is used), and IDNA functions
-   (which load libidn), all of which load their respective DSOs on
+   (which load libidn2), all of which load their respective DSOs on
    demand, and so should not impact program startup.  That is to say
    that the DSOs are loaded as part of an API call and therefore we
    will be calling that family of API functions shortly so RTLD_NOW or
diff --git a/include/idna.h b/include/idna.h
deleted file mode 100644
index dcb271d575..0000000000
--- a/include/idna.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IDNA_H
-#include <libidn/idna.h>
-
-extern __typeof (idna_to_ascii_lz) __idna_to_ascii_lz attribute_hidden;
-extern __typeof (idna_to_unicode_lzlz ) __idna_to_unicode_lzlz
-     attribute_hidden;
-
-#endif