Commit 71e26752 authored by Brian R. Bondy's avatar Brian R. Bondy Committed by Georg Koppen
Browse files

Bug 1158866 - Enable MAR verification on linux via NSS. r=rstrong

parent 6b1c8a81

toolkit/mozapps/update/updater/updater-common.build

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ elif CONFIG['OS_ARCH'] == 'Linux' and CONFIG['MOZ_VERIFY_MAR_SIGNATURE']: 
        'signmar',

        'updatecommon',

    ]

    OS_LIBS += CONFIG['nspr']

    OS_LIBS += CONFIG['NSPR_LIBS']

else:

    USE_LIBS += [

        'updatecommon',

toolkit/xre/nsUpdateDriver.cpp

+36 −0
Original line number Diff line number Diff line
@@ -483,6 +483,36 @@ CopyUpdaterIntoUpdateDir(nsIFile *greDir, nsIFile *appDir, nsIFile *updateDir, 
  return NS_SUCCEEDED(rv); 

}



/**

 * Appends the specified path to the library path.

 * This is used so that updater can find libmozsqlite3.so and other shared libs.

 *

 * @param pathToAppend A new library path to prepend to LD_LIBRARY_PATH

 */

#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && !defined(XP_MACOSX)

#include "prprf.h"

#define PATH_SEPARATOR ":"

#define LD_LIBRARY_PATH_ENVVAR_NAME "LD_LIBRARY_PATH"

static void

AppendToLibPath(const char *pathToAppend)

{

  char *s = nullptr;

  char *pathValue = getenv(LD_LIBRARY_PATH_ENVVAR_NAME);

  if (nullptr == pathValue || '\0' == *pathValue) {

    s = PR_smprintf("%s=%s", LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend);

  } else {

    s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s",

                    LD_LIBRARY_PATH_ENVVAR_NAME, pathToAppend, pathValue);

  }



  // The memory used by PR_SetEnv is not copied to the environment on all

  // platform, it can be used by reference directly. So we purposely do not

  // call PR_smprintf_free on s.  Subsequent calls to PR_SetEnv will free

  // the old memory first.

  PR_SetEnv(s);

}

#endif



/**

 * Switch an existing application directory to an updated version that has been

 * staged.
@@ -696,6 +726,9 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, 
  if (gSafeMode) {

    PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");

  }

#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && !defined(XP_MACOSX)

  AppendToLibPath(installDirPath.get());

#endif



#if defined(TOR_BROWSER_UPDATE) && defined(XP_WIN)

  nsresult rv2 = AdjustPathForUpdater(appDir);
@@ -993,6 +1026,9 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, 
  if (gSafeMode) {

    PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");

  }

#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && !defined(XP_MACOSX)

  AppendToLibPath(installDirPath.get());

#endif



  if (isOSUpdate) {

    PR_SetEnv("MOZ_OS_UPDATE=1");