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

Bug 973933 - Temporarily disable Linux for MAR verification. r=rstrong 

Conflicts:
	browser/confvars.sh
parent d0351675

browser/confvars.sh

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ MOZ_PHOENIX=1 


if test "$OS_ARCH" = "WINNT"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

elif test "$OS_ARCH" = "Linux"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

elif test "$OS_ARCH" = "Darwin"; then

  MOZ_VERIFY_MAR_SIGNATURE=1

fi

toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ skip-if = toolkit == 'gonk' 
reason = bug 820380

[marStageSuccessPartial.js]

[marVersionDowngrade.js]

skip-if = os != 'win' && os != 'mac' && os != 'linux'

skip-if = os != 'win' && os != 'mac'

[marWrongChannel.js]

skip-if = os != 'win' && os != 'mac' && os != 'linux'

skip-if = os != 'win' && os != 'mac'

[marStageFailurePartial.js]

[marCallbackAppSuccessComplete_win.js]

run-if = os == 'win'

toolkit/mozapps/update/updater/archivereader.cpp

+4 −3
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ ArchiveReader::VerifySignature() 
    return ARCHIVE_NOT_OPEN;

  }



#ifdef MOZ_VERIFY_MAR_SIGNATURE

#ifndef MOZ_VERIFY_MAR_SIGNATURE

  return OK;

#else

#ifdef UPDATER_XPCSHELL_CERT

  int rv = VerifyLoadedCert(mArchive, xpcshellCertData);

#else
@@ -91,9 +93,8 @@ ArchiveReader::VerifySignature() 
    rv = VerifyLoadedCert(mArchive, secondaryCertData);

  }

#endif

#endif



  return rv;

#endif

}



/**