[tor-commits] [tor-browser-build/master] Bug 27320: Add certutil and signmar to Windows mar-tools

[gk at torproject.org]

commit 6ed7eacc5b6b75fe888c67a7810c6bddad815f09
Author: JeremyRand <biolizard89 at gmail.com>
Date:   Wed Oct 10 20:15:05 2018 +0000

    Bug 27320: Add certutil and signmar to Windows mar-tools
    
    These binaries were already being built but were being discarded.
    Since reproducible builds of these tools for Windows are likely to be
    useful to some people (even though they're not required for Tor Browser
    to operate), it seems like they're worth distributing.
    
    They're placed in the mar-tools zip because that's where they were
    already being placed for Linux.
---
 projects/firefox/build | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/projects/firefox/build b/projects/firefox/build
index 489d087..da7640a 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -201,6 +201,15 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
       cp -p obj-*/dist/bin/$LIB $MARTOOLS/
   done
 [% END %]
+[% IF c("var/windows") %]
+  cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/
+  cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/
+  NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll"
+  for LIB in $NSS_LIBS; do
+      cp -p obj-*/dist/bin/$LIB $MARTOOLS/
+  done
+  cp -a $rootdir/msvcr100.dll $MARTOOLS/
+[% END %]
 
 cd $distdir