diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-05-23 15:26:19 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-05-23 15:27:24 +0200 |
| commit | 7f9f1ecb710eac4d65bb02785ddf288cac098323 (patch) | |
| tree | b93086996bfb5edf0221b895128ef5a6e709dead /inet/net-internal.h | |
| parent | 5f7b841d3aebdccc2baed27cb4b22ddb08cd7c0c (diff) | |
| download | glibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.tar glibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.tar.gz glibc-7f9f1ecb710eac4d65bb02785ddf288cac098323.tar.bz2 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 'inet/net-internal.h')
| -rw-r--r-- | inet/net-internal.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/inet/net-internal.h b/inet/net-internal.h index 8a9505cf99..0ba6736aef 100644 --- a/inet/net-internal.h +++ b/inet/net-internal.h @@ -29,6 +29,33 @@ int __inet6_scopeid_pton (const struct in6_addr *address, libc_hidden_proto (__inet6_scopeid_pton) +/* IDNA conversion. These functions convert domain names between the + current multi-byte character set and the IDNA encoding. On + success, the result string is written to *RESULT (which the caller + has to free), and zero is returned. On error, an EAI_* error code + is returned (see <netdb.h>), and *RESULT is not changed. */ +int __idna_to_dns_encoding (const char *name, char **result); +libc_hidden_proto (__idna_to_dns_encoding) +int __idna_from_dns_encoding (const char *name, char **result); +libc_hidden_proto (__idna_from_dns_encoding) + + +/* Return value of __idna_name_classify below. */ +enum idna_name_classification +{ + idna_name_ascii, /* No non-ASCII characters. */ + idna_name_nonascii, /* Non-ASCII characters, no backslash. */ + idna_name_nonascii_backslash, /* Non-ASCII characters with backslash. */ + idna_name_encoding_error, /* Decoding error. */ + idna_name_memory_error, /* Memory allocation failure. */ + idna_name_error, /* Other error during decoding. Check errno. */ +}; + +/* Check the specified name for non-ASCII characters and backslashes + or encoding errors. */ +enum idna_name_classification __idna_name_classify (const char *name) + attribute_hidden; + /* Deadline handling for enforcing timeouts. Code should call __deadline_current_time to obtain the current time |