wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 864633 - broken site identity info bar. r=bsmith

Browse Source 
--HG--
extra : rebase_source : 36c4613ed39ab93c33008964ed62bccdcacc9c9c
This commit is contained in:
Camilo Viecco 2013-04-25 13:39:43 -07:00
parent 19c25420e7
commit 31e6bb4a33
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/confvars.sh
View File

@ -25,6 +25,7 @@ MOZ_CAPTIVEDETECT=1
MOZ_WEBSMS_BACKEND=1
MOZ_DISABLE_CRYPTOLEGACY=1
MOZ_APP_STATIC_INI=1
NSS_NO_LIBPKIX=1
if test "$OS_TARGET" = "Android"; then
MOZ_CAPTURE=1

13
configure.in
View File

@ -223,7 +223,6 @@ if test -n "$gonkdir" ; then
AC_DEFINE(HAVE_PTHREADS)
CROSS_COMPILE=1
MOZ_CHROME_FILE_FORMAT=omni
NSS_NO_LIBPKIX=1
direct_nspr_config=1
else
MOZ_ANDROID_NDK
@ -4268,6 +4267,7 @@ MOZ_SYS_MSG=
MOZ_TIME_MANAGER=
MOZ_PAY=
MOZ_AUDIO_CHANNEL_MANAGER=
NSS_NO_LIBPKIX=
case "$target_os" in
mingw*)
@ -6429,6 +6429,15 @@ if test -n "$MOZ_DISABLE_CRYPTOLEGACY"; then
fi
AC_SUBST(MOZ_DISABLE_CRYPTOLEGACY)
dnl ========================================================
dnl = Disable libpkix
dnl ========================================================
if test -n "$NSS_NO_LIBPKIX"; then
AC_DEFINE(NSS_NO_LIBPKIX)
fi
AC_SUBST(NSS_NO_LIBPKIX)
dnl ========================================================
dnl =
dnl = Module specific options
@ -8525,8 +8534,6 @@ AC_SUBST(MOZ_PERMISSIONS)
AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST(MOZ_JS_LIBS)
AC_SUBST(MOZ_PSM)
AC_DEFINE(NSS_NO_LIBPKIX)
AC_SUBST(NSS_NO_LIBPKIX)
AC_SUBST(MOZ_DEBUG)
AC_SUBST(MOZ_DEBUG_SYMBOLS)
AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)

3
security/manager/ssl/src/nsNSSCertificateDB.cpp
View File

@ -1359,11 +1359,12 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
#ifndef NSS_NO_LIBPKIX
}
else {
nsresult nsrv;
nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
if (!inss)
return nsrv;
RefPtr<nsCERTValInParamWrapper> survivingParams;
nsresult nsrv = inss->GetDefaultCERTValInParam(survivingParams);
nsrv = inss->GetDefaultCERTValInParam(survivingParams);
if (NS_FAILED(nsrv))
return nsrv;
CERTValOutParam cvout[1];