commit 909d50c7f074ea82534839c016db8e59a12ec9b8 Author: Kathy Brade <brade@pearlcrescent.com> Date: Tue Jul 21 11:29:42 2020 -0400 fixup! Bug 13379: Sign our MAR files. --- modules/libmar/tool/mar.c | 9 --------- modules/libmar/tool/moz.build | 7 ------- 2 files changed, 16 deletions(-) diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 4252808b9b8f..ea2b79924914 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -30,11 +30,7 @@ int mar_repackage_and_sign(const char* NSSConfigDir, const char* src, const char* dest); static void print_version() { -#ifdef TOR_BROWSER_UPDATE - printf("Version: %s\n", TOR_BROWSER_VERSION_QUOTED); -#else printf("Version: %s\n", MOZ_APP_VERSION); -#endif printf("Default Channel ID: %s\n", MAR_CHANNEL_ID); } @@ -129,13 +125,8 @@ static int mar_test(const char* path) { int main(int argc, char** argv) { const char* certNames[MAX_SIGNATURES]; -#ifdef TOR_BROWSER_UPDATE - char* MARChannelID = MAR_CHANNEL_ID; - char* productVersion = TOR_BROWSER_VERSION_QUOTED; -#else char* MARChannelID = NULL; char* productVersion = NULL; -#endif int rv = -1; #if !defined(NO_SIGN_VERIFY) char* NSSConfigDir = NULL; diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index b0f87e8068ce..8953af0bb15c 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -61,10 +61,3 @@ for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): HOST_DEFINES[var] = '"%s"' % CONFIG[var] if SOURCES: DEFINES[var] = HOST_DEFINES[var] - -if CONFIG['TOR_BROWSER_UPDATE']: - DEFINES['TOR_BROWSER_UPDATE'] = '%s' % CONFIG['TOR_BROWSER_UPDATE'] -if CONFIG['TOR_BROWSER_VERSION_QUOTED']: - DEFINES['TOR_BROWSER_VERSION_QUOTED'] = '%s' % CONFIG['TOR_BROWSER_VERSION_QUOTED'] - -