Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1402048 - Remove the legacy non-IDNA2008 code path from nsIDNService, now that we always require ICU to build. r=valentin

Browse Source
This commit is contained in:
Jonathan Kew 2017-09-22 19:25:50 +01:00
parent 2de2826b94
commit 78a3e1848f
6 changed files with 1 additions and 3208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netwerk/dns/moz.build
View File

@ -69,13 +69,7 @@ LOCAL_INCLUDES += [
'/netwerk/base',
]
if CONFIG['ENABLE_INTL_API']:
DEFINES['IDNA2008'] = True
USE_LIBS += ['icu']
else:
UNIFIED_SOURCES += [
'nameprep.c',
]
USE_LIBS += ['icu']
if CONFIG['GNU_CXX']:
CXXFLAGS += ['-Wno-error=shadow']

347
netwerk/dns/nameprep.c
View File

@ -1,347 +0,0 @@
/*
* Copyright (c) 2001,2002 Japan Network Information Center.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set forth bellow.
*
* LICENSE TERMS AND CONDITIONS
*
* The following License Terms and Conditions apply, unless a different
* license is obtained from Japan Network Information Center ("JPNIC"),
* a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
* Chiyoda-ku, Tokyo 101-0047, Japan.
*
* 1. Use, Modification and Redistribution (including distribution of any
* modified or derived work) in source and/or binary forms is permitted
* under this License Terms and Conditions.
*
* 2. Redistribution of source code must retain the copyright notices as they
* appear in each source code file, this License Terms and Conditions.
*
* 3. Redistribution in binary form must reproduce the Copyright Notice,
* this License Terms and Conditions, in the documentation and/or other
* materials provided with the distribution. For the purposes of binary
* distribution the "Copyright Notice" refers to the following language:
* "Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved."
*
* 4. The name of JPNIC may not be used to endorse or promote products
* derived from this Software without specific prior written approval of
* JPNIC.
*
* 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
#include <stdlib.h>
#include <string.h>
#include "nsIDNKitInterface.h"
#define UCS_MAX 0x7fffffff
#define UNICODE_MAX 0x10ffff
/*
* Load NAMEPREP compiled tables.
*/
#include "nameprepdata.c"
/*
* Define mapping/checking functions for each version of the draft.
*/
#define VERSION id11
#include "nameprep_template.c"
#undef VERSION
typedef const char *(*nameprep_mapproc)(uint32_t v);
typedef int (*nameprep_checkproc)(uint32_t v);
typedef idn_biditype_t (*nameprep_biditypeproc)(uint32_t v);
static struct idn_nameprep {
char *version;
nameprep_mapproc map_proc;
nameprep_checkproc prohibited_proc;
nameprep_checkproc unassigned_proc;
nameprep_biditypeproc biditype_proc;
} nameprep_versions[] = {
#define MAKE_NAMEPREP_HANDLE(version, id) \
{ version, \
compose_sym2(nameprep_map_, id), \
compose_sym2(nameprep_prohibited_, id), \
compose_sym2(nameprep_unassigned_, id), \
compose_sym2(nameprep_biditype_, id), }
MAKE_NAMEPREP_HANDLE("nameprep-11", id11),
{ NULL, NULL, NULL, NULL, NULL },
};
static idn_result_t idn_nameprep_check(nameprep_checkproc proc,
const uint32_t *str,
const uint32_t **found);
idn_result_t
idn_nameprep_create(const char *version, idn_nameprep_t *handlep) {
idn_nameprep_t handle;
assert(handlep != NULL);
TRACE(("idn_nameprep_create(version=%-.50s)\n",
version == NULL ? "<NULL>" : version));
if (version == NULL)
version = IDN_NAMEPREP_CURRENT;
/*
* Lookup table for the specified version. Since the number of
* versions won't be large (I don't want see draft-23 or such :-),
* simple linear search is OK.
*/
for (handle = nameprep_versions; handle->version != NULL; handle++) {
if (strcmp(handle->version, version) == 0) {
*handlep = handle;
return (idn_success);
}
}
return (idn_notfound);
}
void
idn_nameprep_destroy(idn_nameprep_t handle) {
assert(handle != NULL);
TRACE(("idn_nameprep_destroy()\n"));
/* Nothing to do. */
}
idn_result_t
idn_nameprep_map(idn_nameprep_t handle, const uint32_t *from,
uint32_t *to, size_t tolen) {
assert(handle != NULL && from != NULL && to != NULL);
TRACE(("idn_nameprep_map(ctx=%s, from=\"%s\")\n",
handle->version, idn__debug_ucs4xstring(from, 50)));
while (*from != '\0') {
uint32_t v = *from;
const char *mapped;
if (v > UCS_MAX) {
/* This cannot happen, but just in case.. */
return (idn_invalid_codepoint);
} else if (v > UNICODE_MAX) {
/* No mapping is possible. */
mapped = NULL;
} else {
/* Try mapping. */
mapped = (*handle->map_proc)(v);
}
if (mapped == NULL) {
/* No mapping. Just copy verbatim. */
if (tolen < 1)
return (idn_buffer_overflow);
*to++ = v;
tolen--;
} else {
const unsigned char *mappeddata;
size_t mappedlen;
mappeddata = (const unsigned char *)mapped + 1;
mappedlen = *mapped;
if (tolen < (mappedlen + 3) / 4)
return (idn_buffer_overflow);
tolen -= (mappedlen + 3) / 4;
while (mappedlen >= 4) {
*to = *mappeddata++;
*to |= *mappeddata++ << 8;
*to |= *mappeddata++ << 16;
*to |= *mappeddata++ << 24;
mappedlen -= 4;
to++;
}
if (mappedlen > 0) {
*to = *mappeddata++;
*to |= (mappedlen >= 2) ?
*mappeddata++ << 8: 0;
*to |= (mappedlen >= 3) ?
*mappeddata++ << 16: 0;
to++;
}
}
from++;
}
if (tolen == 0)
return (idn_buffer_overflow);
*to = '\0';
return (idn_success);
}
idn_result_t
idn_nameprep_isprohibited(idn_nameprep_t handle, const uint32_t *str,
const uint32_t **found) {
assert(handle != NULL && str != NULL && found != NULL);
TRACE(("idn_nameprep_isprohibited(ctx=%s, str=\"%s\")\n",
handle->version, idn__debug_ucs4xstring(str, 50)));
return (idn_nameprep_check(handle->prohibited_proc, str, found));
}
idn_result_t
idn_nameprep_isunassigned(idn_nameprep_t handle, const uint32_t *str,
const uint32_t **found) {
assert(handle != NULL && str != NULL && found != NULL);
TRACE(("idn_nameprep_isunassigned(handle->version, str=\"%s\")\n",
handle->version, idn__debug_ucs4xstring(str, 50)));
return (idn_nameprep_check(handle->unassigned_proc, str, found));
}
static idn_result_t
idn_nameprep_check(nameprep_checkproc proc, const uint32_t *str,
const uint32_t **found) {
uint32_t v;
while (*str != '\0') {
v = *str;
if (v > UCS_MAX) {
/* This cannot happen, but just in case.. */
return (idn_invalid_codepoint);
} else if (v > UNICODE_MAX) {
/* It is invalid.. */
*found = str;
return (idn_success);
} else if ((*proc)(v)) {
*found = str;
return (idn_success);
}
str++;
}
*found = NULL;
return (idn_success);
}
idn_result_t
idn_nameprep_isvalidbidi(idn_nameprep_t handle, const uint32_t *str,
const uint32_t **found) {
uint32_t v;
idn_biditype_t first_char;
idn_biditype_t last_char;
int found_r_al;
assert(handle != NULL && str != NULL && found != NULL);
TRACE(("idn_nameprep_isvalidbidi(ctx=%s, str=\"%s\")\n",
handle->version, idn__debug_ucs4xstring(str, 50)));
if (*str == '\0') {
*found = NULL;
return (idn_success);
}
/*
* check first character's type and initialize variables.
*/
found_r_al = 0;
if (*str > UCS_MAX) {
/* This cannot happen, but just in case.. */
return (idn_invalid_codepoint);
} else if (*str > UNICODE_MAX) {
/* It is invalid.. */
*found = str;
return (idn_success);
}
first_char = last_char = (*(handle->biditype_proc))(*str);
if (first_char == idn_biditype_r_al) {
found_r_al = 1;
}
str++;
/*
* see whether string is valid or not.
*/
while (*str != '\0') {
v = *str;
if (v > UCS_MAX) {
/* This cannot happen, but just in case.. */
return (idn_invalid_codepoint);
} else if (v > UNICODE_MAX) {
/* It is invalid.. */
*found = str;
return (idn_success);
} else {
last_char = (*(handle->biditype_proc))(v);
if (found_r_al && last_char == idn_biditype_l) {
*found = str;
return (idn_success);
}
if (first_char != idn_biditype_r_al && last_char == idn_biditype_r_al) {
*found = str;
return (idn_success);
}
if (last_char == idn_biditype_r_al) {
found_r_al = 1;
}
}
str++;
}
if (found_r_al) {
if (last_char != idn_biditype_r_al) {
*found = str - 1;
return (idn_success);
}
}
*found = NULL;
return (idn_success);
}
idn_result_t
idn_nameprep_createproc(const char *parameter, void **handlep) {
return idn_nameprep_create(parameter, (idn_nameprep_t *)handlep);
}
void
idn_nameprep_destroyproc(void *handle) {
idn_nameprep_destroy((idn_nameprep_t)handle);
}
idn_result_t
idn_nameprep_mapproc(void *handle, const uint32_t *from,
uint32_t *to, size_t tolen) {
return idn_nameprep_map((idn_nameprep_t)handle, from, to, tolen);
}
idn_result_t
idn_nameprep_prohibitproc(void *handle, const uint32_t *str,
const uint32_t **found) {
return idn_nameprep_isprohibited((idn_nameprep_t)handle, str, found);
}
idn_result_t
idn_nameprep_unassignedproc(void *handle, const uint32_t *str,
const uint32_t **found) {
return idn_nameprep_isunassigned((idn_nameprep_t)handle, str, found);
}
idn_result_t
idn_nameprep_bidiproc(void *handle, const uint32_t *str,
const uint32_t **found) {
return idn_nameprep_isvalidbidi((idn_nameprep_t)handle, str, found);
}

139
netwerk/dns/nameprep_template.c
View File

@ -1,139 +0,0 @@
/*
* Copyright (c) 2001 Japan Network Information Center. All rights reserved.
*
* By using this file, you agree to the terms and conditions set forth bellow.
*
* LICENSE TERMS AND CONDITIONS
*
* The following License Terms and Conditions apply, unless a different
* license is obtained from Japan Network Information Center ("JPNIC"),
* a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
* Chiyoda-ku, Tokyo 101-0047, Japan.
*
* 1. Use, Modification and Redistribution (including distribution of any
* modified or derived work) in source and/or binary forms is permitted
* under this License Terms and Conditions.
*
* 2. Redistribution of source code must retain the copyright notices as they
* appear in each source code file, this License Terms and Conditions.
*
* 3. Redistribution in binary form must reproduce the Copyright Notice,
* this License Terms and Conditions, in the documentation and/or other
* materials provided with the distribution. For the purposes of binary
* distribution the "Copyright Notice" refers to the following language:
* "Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved."
*
* 4. The name of JPNIC may not be used to endorse or promote products
* derived from this Software without specific prior written approval of
* JPNIC.
*
* 5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
/*
* Include this file once for each version of NAMEPREP.
* VERSION should be defined to appropriate value before inclusion.
*/
#ifndef NAMEPREP_TEMPLATE_INIT
#define NAMEPREP_TEMPLATE_INIT
/* Symbol composition. */
#define compose_sym2(a, b) compose_sym2X(a, b)
#define compose_sym2X(a, b) a ## b
#define compose_sym3(a, b, c) compose_sym3X(a, b, c)
#define compose_sym3X(a, b, c) a ## b ## c
/* The table is based on "Optimized Two-Stage Table" mentioned in
* Unicode 3.0 page 106, extended to handle 21bit data instead of 16 bit.
*/
/* Index calculation for multi-level index tables. */
#define IDX0(type, v) IDX_0(v, BITS1(type), BITS2(type))
#define IDX1(type, v) IDX_1(v, BITS1(type), BITS2(type))
#define IDX2(type, v) IDX_2(v, BITS1(type), BITS2(type))
#define IDX_0(v, bits1, bits2) ((v) >> ((bits1) + (bits2)))
#define IDX_1(v, bits1, bits2) (((v) >> (bits2)) & ((1 << (bits1)) - 1))
#define IDX_2(v, bits1, bits2) ((v) & ((1 << (bits2)) - 1))
#define BITS1(type) type ## _BITS_1
#define BITS2(type) type ## _BITS_2
#endif /* NAMEPREP_TEMPLATE_INIT */
static const char *
compose_sym2(nameprep_map_, VERSION) (uint32_t v) {
int idx0 = IDX0(MAP, v);
int idx1 = IDX1(MAP, v);
int idx2 = IDX2(MAP, v);
int offset;
#define IMAP compose_sym3(nameprep_, VERSION, _map_imap)
#define TABLE compose_sym3(nameprep_, VERSION, _map_table)
#define DATA compose_sym3(nameprep_, VERSION, _map_data)
offset = TABLE[IMAP[IMAP[idx0] + idx1]].tbl[idx2];
if (offset == 0)
return (NULL); /* no mapping */
return (const char *)(DATA + offset);
#undef IMAP
#undef TABLE
#undef DATA
}
static int
compose_sym2(nameprep_prohibited_, VERSION) (uint32_t v) {
int idx0 = IDX0(PROH, v);
int idx1 = IDX1(PROH, v);
int idx2 = IDX2(PROH, v);
const unsigned char *bm;
#define IMAP compose_sym3(nameprep_, VERSION, _prohibited_imap)
#define BITMAP compose_sym3(nameprep_, VERSION, _prohibited_bitmap)
bm = BITMAP[IMAP[IMAP[idx0] + idx1]].bm;
return (bm[idx2 / 8] & (1 << (idx2 % 8)));
#undef IMAP
#undef BITMAP
}
static int
compose_sym2(nameprep_unassigned_, VERSION) (uint32_t v) {
int idx0 = IDX0(UNAS, v);
int idx1 = IDX1(UNAS, v);
int idx2 = IDX2(UNAS, v);
const unsigned char *bm;
#define IMAP compose_sym3(nameprep_, VERSION, _unassigned_imap)
#define BITMAP compose_sym3(nameprep_, VERSION, _unassigned_bitmap)
bm = BITMAP[IMAP[IMAP[idx0] + idx1]].bm;
return (bm[idx2 / 8] & (1 << (idx2 % 8)));
#undef IMAP
#undef BITMAP
}
static idn_biditype_t
compose_sym2(nameprep_biditype_, VERSION) (uint32_t v) {
int idx0 = IDX0(BIDI, v);
int idx1 = IDX1(BIDI, v);
int idx2 = IDX2(BIDI, v);
int offset;
#define IMAP compose_sym3(nameprep_, VERSION, _bidi_imap)
#define TABLE compose_sym3(nameprep_, VERSION, _bidi_table)
#define DATA compose_sym3(nameprep_, VERSION, _bidi_data)
offset = TABLE[IMAP[IMAP[idx0] + idx1]].tbl[idx2];
return DATA[offset];
#undef IMAP
#undef TABLE
#undef DATA
}

2588
netwerk/dns/nameprepdata.c
View File

File diff suppressed because it is too large Load Diff

117
netwerk/dns/nsIDNService.cpp
View File

@ -17,7 +17,6 @@
#include "nsISupportsPrimitives.h"
#include "punycode.h"
#ifdef IDNA2008
// Currently we use the non-transitional processing option -- see
// http://unicode.org/reports/tr46/
// To switch to transitional processing, change the value of this flag
@ -26,7 +25,6 @@
const bool kIDNA2008_TransitionalProcessing = false;
#include "ICUUtils.h"
#endif
using namespace mozilla::unicode;
@ -146,34 +144,21 @@ nsIDNService::nsIDNService()
{
MOZ_ASSERT(NS_IsMainThread());
#ifdef IDNA2008
uint32_t IDNAOptions = UIDNA_CHECK_BIDI | UIDNA_CHECK_CONTEXTJ;
if (!kIDNA2008_TransitionalProcessing) {
IDNAOptions |= UIDNA_NONTRANSITIONAL_TO_UNICODE;
}
UErrorCode errorCode = U_ZERO_ERROR;
mIDNA = uidna_openUTS46(IDNAOptions, &errorCode);
#else
if (idn_success != idn_nameprep_create(nullptr, &mNamePrepHandle))
mNamePrepHandle = nullptr;
mNormalizer = do_GetService(NS_UNICODE_NORMALIZER_CONTRACTID);
/* member initializers and constructor code */
#endif
}
nsIDNService::~nsIDNService()
{
MOZ_ASSERT(NS_IsMainThread());
#ifdef IDNA2008
uidna_close(mIDNA);
#else
idn_nameprep_destroy(mNamePrepHandle);
#endif
}
#ifdef IDNA2008
nsresult
nsIDNService::IDNA2008ToUnicode(const nsACString& input, nsAString& output)
{
@ -246,7 +231,6 @@ nsIDNService::IDNA2008StringPrep(const nsAString& input,
return rv;
}
#endif
NS_IMETHODIMP nsIDNService::ConvertUTF8toACE(const nsACString & input, nsACString & ace)
{
@ -546,21 +530,6 @@ static nsresult utf16ToUcs4(const nsAString& in,
return NS_OK;
}
#ifndef IDNA2008
static void ucs4toUtf16(const uint32_t *in, nsAString& out)
{
while (*in) {
if (!IS_IN_BMP(*in)) {
out.Append((char16_t) H_SURROGATE(*in));
out.Append((char16_t) L_SURROGATE(*in));
}
else
out.Append((char16_t) *in);
in++;
}
}
#endif
static nsresult punycode(const nsAString& in, nsACString& out)
{
uint32_t ucs4Buf[kMaxDNSNodeLen + 1];
@ -614,71 +583,7 @@ static nsresult punycode(const nsAString& in, nsACString& out)
nsresult nsIDNService::stringPrep(const nsAString& in, nsAString& out,
stringPrepFlag flag)
{
#ifdef IDNA2008
return IDNA2008StringPrep(in, out, flag);
#else
if (!mNamePrepHandle || !mNormalizer)
return NS_ERROR_FAILURE;
uint32_t ucs4Buf[kMaxDNSNodeLen + 1];
uint32_t ucs4Len;
nsresult rv = utf16ToUcs4(in, ucs4Buf, kMaxDNSNodeLen, &ucs4Len);
NS_ENSURE_SUCCESS(rv, rv);
// map
idn_result_t idn_err;
uint32_t namePrepBuf[kMaxDNSNodeLen * 3]; // map up to three characters
idn_err = idn_nameprep_map(mNamePrepHandle, (const uint32_t *) ucs4Buf,
(uint32_t *) namePrepBuf, kMaxDNSNodeLen * 3);
NS_ENSURE_TRUE(idn_err == idn_success, NS_ERROR_MALFORMED_URI);
nsAutoString namePrepStr;
ucs4toUtf16(namePrepBuf, namePrepStr);
if (namePrepStr.Length() >= kMaxDNSNodeLen)
return NS_ERROR_MALFORMED_URI;
// normalize
nsAutoString normlizedStr;
rv = mNormalizer->NormalizeUnicodeNFKC(namePrepStr, normlizedStr);
if (normlizedStr.Length() >= kMaxDNSNodeLen)
return NS_ERROR_MALFORMED_URI;
// set the result string
out.Assign(normlizedStr);
if (flag == eStringPrepIgnoreErrors) {
return NS_OK;
}
// prohibit
const uint32_t *found = nullptr;
idn_err = idn_nameprep_isprohibited(mNamePrepHandle,
(const uint32_t *) ucs4Buf, &found);
if (idn_err != idn_success || found) {
rv = NS_ERROR_MALFORMED_URI;
} else {
// check bidi
idn_err = idn_nameprep_isvalidbidi(mNamePrepHandle,
(const uint32_t *) ucs4Buf, &found);
if (idn_err != idn_success || found) {
rv = NS_ERROR_MALFORMED_URI;
} else if (flag == eStringPrepForUI) {
// check unassigned code points
idn_err = idn_nameprep_isunassigned(mNamePrepHandle,
(const uint32_t *) ucs4Buf, &found);
if (idn_err != idn_success || found) {
rv = NS_ERROR_MALFORMED_URI;
}
}
}
if (flag == eStringPrepForDNS && NS_FAILED(rv)) {
out.Truncate();
}
return rv;
#endif
}
nsresult nsIDNService::stringPrepAndACE(const nsAString& in, nsACString& out,
@ -769,31 +674,9 @@ nsresult nsIDNService::decodeACE(const nsACString& in, nsACString& out,
}
nsAutoString utf16;
#ifdef IDNA2008
nsresult result = IDNA2008ToUnicode(in, utf16);
NS_ENSURE_SUCCESS(result, result);
#else
// RFC 3490 - 4.2 ToUnicode
// The ToUnicode output never contains more code points than its input.
punycode_uint output_length = in.Length() - kACEPrefixLen + 1;
auto *output = new punycode_uint[output_length];
NS_ENSURE_TRUE(output, NS_ERROR_OUT_OF_MEMORY);
enum punycode_status status = punycode_decode(in.Length() - kACEPrefixLen,
PromiseFlatCString(in).get() + kACEPrefixLen,
&output_length,
output,
nullptr);
if (status != punycode_success) {
delete [] output;
return NS_ERROR_MALFORMED_URI;
}
// UCS4 -> UTF8
output[output_length] = 0;
ucs4toUtf16(output, utf16);
delete [] output;
#endif
if (flag != eStringPrepForUI || isLabelSafe(utf16)) {
CopyUTF16toUTF8(utf16, out);
} else {

10
netwerk/dns/nsIDNService.h
View File

@ -12,12 +12,7 @@
#include "nsUnicodeScriptCodes.h"
#include "nsWeakReference.h"
#ifdef IDNA2008
#include "unicode/uidna.h"
#else
#include "nsIUnicodeNormalizer.h"
#include "nsIDNKitInterface.h"
#endif
#include "nsString.h"
@ -151,7 +146,6 @@ private:
bool illegalScriptCombo(mozilla::unicode::Script script,
int32_t& savedScript);
#ifdef IDNA2008
/**
* Convert a DNS label from ASCII to Unicode using IDNA2008
*/
@ -164,10 +158,6 @@ private:
stringPrepFlag flag);
UIDNA* mIDNA;
#else
idn_nameprep_t mNamePrepHandle;
nsCOMPtr<nsIUnicodeNormalizer> mNormalizer;
#endif
// We use this mutex to guard access to:
// |mIDNBlacklist|, |mShowPunycode|, |mRestrictionProfile|,