Bug 864633 - broken site identity info bar. r=bsmith
authorCamilo Viecco <cviecco@mozilla.com>
Thu, 25 Apr 2013 13:39:43 -0700
changeset 140915 0373ea7e7f54cf364adae796efd590ec5829a33b
parent 140914 d35407880ce28d13bc1f459066111eedee6b35a3
child 140916 45e73d8d89c978a0e7967bcb8e915578b8530e97
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmith
bugs864633
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 864633 - broken site identity info bar. r=bsmith
b2g/confvars.sh
configure.in
security/manager/ssl/src/nsNSSCertificateDB.cpp
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -20,16 +20,17 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/bran
 MOZ_SAFE_BROWSING=
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_METRICS=1
 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
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
 # use custom widget for html:select
--- a/configure.in
+++ b/configure.in
@@ -218,17 +218,16 @@ if test -n "$gonkdir" ; then
         HOST_LDFLAGS=" "
     fi
 
     AC_DEFINE(ANDROID)
     AC_DEFINE(HAVE_SYS_UIO_H)
     AC_DEFINE(HAVE_PTHREADS)
     CROSS_COMPILE=1
     MOZ_CHROME_FILE_FORMAT=omni
-    NSS_NO_LIBPKIX=1
     direct_nspr_config=1
 else
     MOZ_ANDROID_NDK
 
     case "$target" in
     *-android*|*-linuxandroid*)
         if test -z "$ANDROID_PACKAGE_NAME" ; then
             ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
@@ -4263,16 +4262,17 @@ MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_ANDROID_WALLPAPER=
 MOZ_ANDROID_BEAM=
 ACCESSIBILITY=1
 MOZ_SYS_MSG=
 MOZ_TIME_MANAGER=
 MOZ_PAY=
 MOZ_AUDIO_CHANNEL_MANAGER=
+NSS_NO_LIBPKIX=
 
 case "$target_os" in
     mingw*)
         NS_ENABLE_TSF=1
         AC_DEFINE(NS_ENABLE_TSF)
         ;;
 esac
 
@@ -6425,16 +6425,25 @@ dnl ====================================
 dnl = Disable DOMCrypto
 dnl ========================================================
 if test -n "$MOZ_DISABLE_CRYPTOLEGACY"; then
     AC_DEFINE(MOZ_DISABLE_CRYPTOLEGACY)
 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
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Individual module options)
 
 dnl ========================================================
 dnl = Disable feed handling components
@@ -8520,18 +8529,16 @@ AC_SUBST(BIN_FLAGS)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MOZ_PLATFORM_MAEMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 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)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_EXTENSIONS)
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -1354,21 +1354,22 @@ nsNSSCertificateDB::FindCertByEmailAddre
       if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert,
           true, certUsageEmailRecipient, PR_Now(), nullptr, nullptr) == SECSuccess) {
         // found a valid certificate
         break;
       }
 #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];
       cvout[0].type = cert_po_end;
       if (CERT_PKIXVerifyCert(node->cert, certificateUsageEmailRecipient,
                               survivingParams->GetRawPointerForNSS(),
                               cvout, nullptr)
           == SECSuccess) {