1217985 - Don't depend on Windows crypto DLLs if not building the Windows Maintenance Service

Status: RESOLVED FIXED

(Toolkit :: Application Update, defect)

Description

[Arthur Edelstein [:arthur]]

In Tor Browser, a patch was introduced to avoid a dependency
on crypt32.dll and wintrust.dll when Windows Maintenance Service is not being built.

Here is a link that tracks the latest version of the Tor Browser patch:
https://torpat.ch/16906

Comment 1

[Arthur Edelstein [:arthur]]

(In reply to Arthur Edelstein from comment #0)

> https://torpat.ch/16906

To clarify: only the a2ebb7e patch will be need for this bug.

(The other patch has already landed in https://hg.mozilla.org/mozilla-central/rev/34bbc3cb3e79.)

Comment 2

[Arthur Edelstein [:arthur]]

Attachment: 0001-Don-t-depend-on-Windows-crypto-DLLs.patch

Here is Tor Browser's patch rebased to the latest version of mozilla-central.

Comment 3

[Robert Strong (they/them - no direct email)]

Comment on attachment 8678401 [details] [diff] [review]
0001-Don-t-depend-on-Windows-crypto-DLLs.patch

Looks fine and thanks!

Comment 4

[Arthur Edelstein [:arthur]]

Try server: https://treeherder.mozilla.org/#/jobs?repo=try&revision=1002a5fe10cd

Comment 5

[Robert Strong (they/them - no direct email)]

I also sent it to try and it looks good
https://treeherder.mozilla.org/#/jobs?repo=try&revision=e7174020d6a9

Comment 6

[Robert Strong (they/them - no direct email)]

Pushed to fx-team
https://hg.mozilla.org/integration/fx-team/rev/c4aebb4abcc5

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/c4aebb4abcc5

Comment 8

[Philip Chee]

> TestAUSHelper.obj : error LNK2019: unresolved external symbol "unsigned long __cdecl VerifyCertificateTrustForFile(wchar_t const *)" (?VerifyCertificateTrustForFile@@YAKPB_W@Z) referenced in function _wmain
> TestAUSHelper.exe : fatal error LNK1120: 1 unresolved externals
> c:/t1/hg/comm-central/mozilla/config/rules.mk:739: recipe for target 'TestAUSHelper.exe' failed
> mozmake[3]: *** [TestAUSHelper.exe] Error 1120
> mozmake[3]: Leaving directory 'c:/t1/hg/objdir-sm/toolkit/mozapps/update/tests'

Comment 9

[Philip Chee]

Attachment: Proposed bustage fix

Is this the correct fix?

Comment 10

[Robert Strong (they/them - no direct email)]

Comment on attachment 8680063 [details] [diff] [review]
Proposed bustage fix

I believe that should be enough.

Are you ok with me landing this?

Comment 11

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/22394f125cb5

Comment 12

[Arthur Edelstein [:arthur]]

Sorry for the bustage -- thanks for fixing it.

Comment 13

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/22394f125cb5