diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-08-29 04:27:26 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:21 +0200 |
| commit | b6ab65880418bce2747f860ae0156447741a82f0 (patch) | |
| tree | 2ba5ae4d7b02e168694fa35f3d76a14073ef1089 /onlineupdate/source | |
| parent | don't use MOZ_ prefixed env vars (diff) | |
| download | core-b6ab65880418bce2747f860ae0156447741a82f0.tar.gz core-b6ab65880418bce2747f860ae0156447741a82f0.zip | |
don't use MOZ prefix for variables
Change-Id: I4d4cf18c4665ccd14b3a2b93da215113e4f2e23a
Diffstat (limited to 'onlineupdate/source')
| -rw-r--r-- | onlineupdate/source/update/updater/archivereader.cxx | 6 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/updater-common.build | 4 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/onlineupdate/source/update/updater/archivereader.cxx b/onlineupdate/source/update/updater/archivereader.cxx index 23f416a17b2a..e62b65b1e4ba 100644 --- a/onlineupdate/source/update/updater/archivereader.cxx +++ b/onlineupdate/source/update/updater/archivereader.cxx @@ -16,7 +16,7 @@ // These are generated at compile time based on the DER file for the channel // being used -#ifdef MOZ_VERIFY_MAR_SIGNATURE +#ifdef VERIFY_MAR_SIGNATURE #ifdef TEST_UPDATER #include "../xpcshellCert.h" #else @@ -55,7 +55,7 @@ VerifyLoadedCert(MarFile *archive, const uint8_t (&certData)[SIZE]) (void)archive; (void)certData; -#ifdef MOZ_VERIFY_MAR_SIGNATURE +#ifdef VERIFY_MAR_SIGNATURE const uint32_t size = SIZE; const uint8_t* const data = &certData[0]; if (mar_verify_signatures(archive, &data, &size, 1)) { @@ -81,7 +81,7 @@ ArchiveReader::VerifySignature() return ARCHIVE_NOT_OPEN; } -#ifndef MOZ_VERIFY_MAR_SIGNATURE +#ifndef VERIFY_MAR_SIGNATURE return OK; #else #ifdef TEST_UPDATER diff --git a/onlineupdate/source/update/updater/updater-common.build b/onlineupdate/source/update/updater/updater-common.build index 78b843632de4..6516a4843c43 100644 --- a/onlineupdate/source/update/updater/updater-common.build +++ b/onlineupdate/source/update/updater/updater-common.build @@ -12,7 +12,7 @@ srcs = [ have_progressui = 0 -if CONFIG['MOZ_VERIFY_MAR_SIGNATURE']: +if CONFIG['VERIFY_MAR_SIGNATURE']: USE_LIBS += [ 'verifymar', ] @@ -45,7 +45,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'crypt32', 'advapi32', ] -elif CONFIG['OS_ARCH'] == 'Linux' and CONFIG['MOZ_VERIFY_MAR_SIGNATURE']: +elif CONFIG['OS_ARCH'] == 'Linux' and CONFIG['VERIFY_MAR_SIGNATURE']: USE_LIBS += [ 'nss', 'signmar', diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 8df53177e437..52d5056116ed 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -94,9 +94,9 @@ void LaunchMacPostProcess(const char* aAppBundle); # define MAYBE_USE_HARD_LINKS 0 -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(_WIN32) && !defined(MACOSX) #include "nss.h" #include "prerror.h" +#if defined(VERIFY_MAR_SIGNATURE) && !defined(_WIN32) && !defined(MACOSX) #endif #ifdef _WIN32 @@ -2026,7 +2026,7 @@ WaitForServiceFinishThread(void *param) } #endif -#ifdef MOZ_VERIFY_MAR_SIGNATURE +#ifdef VERIFY_MAR_SIGNATURE /** * This function reads in the ACCEPTED_MAR_CHANNEL_IDS from update-settings.ini * @@ -2073,7 +2073,7 @@ UpdateThreadFunc(void * /*param*/) rv = gArchiveReader.Open(dataFile); } -#ifdef MOZ_VERIFY_MAR_SIGNATURE +#ifdef VERIFY_MAR_SIGNATURE if (rv == OK) { #ifdef _WIN32 HKEY baseKey = nullptr; @@ -2200,7 +2200,7 @@ UpdateThreadFunc(void * /*param*/) int NS_main(int argc, NS_tchar **argv) { -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(_WIN32) && !defined(MACOSX) +#if defined(VERIFY_MAR_SIGNATURE) && !defined(_WIN32) && !defined(MACOSX) // On Windows and Mac we rely on native APIs to do verifications so we don't // need to initialize NSS at all there. // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS |