wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian R. Bondy 2015-04-06 12:03:19 -04:00
parent 16641b9e4b
commit 705c5ccb2e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/confvars.sh
View File

@ -21,8 +21,6 @@ if test "$OS_ARCH" = "WINNT"; then
fi
fi
fi
elif test "$OS_ARCH" = "Linux"; then
MOZ_VERIFY_MAR_SIGNATURE=1
elif test "$OS_ARCH" = "Darwin"; then
MOZ_VERIFY_MAR_SIGNATURE=1
fi

4
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
View File

@ -19,9 +19,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]
skip-if = os != 'win'

7
toolkit/mozapps/update/updater/archivereader.cpp
View File

@ -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
}
/**