[tor-commits] [tor-messenger-build/updater] Add MAR signing keys

[sukhbir at torproject.org]

commit 3f1f586b54c723eb09327498145f31c0bb5193bf
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Aug 10 12:43:15 2016 -0400

    Add MAR signing keys
    
    Similar to Tor Browser (#18008), we embed two MAR signing keys and will sign
    the builds with either of them.
---
 projects/instantbird/build          |   3 +++
 projects/instantbird/config         |   2 ++
 projects/instantbird/marsigner.der  | Bin 0 -> 1233 bytes
 projects/instantbird/marsigner1.der | Bin 0 -> 1235 bytes
 4 files changed, 5 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 2701591..293fc07 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -90,6 +90,9 @@ then
     done
 fi
 
+cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_primary.der
+cp $rootdir/marsigner1.der toolkit/mozapps/update/updater/release_secondary.der
+
 cp $rootdir/aboutTBUpdateLogo.png browser/base/content/abouttbupdate/
 
 if ls -1 $rootdir/*.nsspatch > /dev/null 2>&1
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 3acde39..65d3316 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -106,6 +106,8 @@ input_files:
   - filename: about-wordmark.png
   - filename: branding-aboutDialog.css
   - filename: updater-text.patch
+  - filename: marsigner.der
+  - filename: marsigner1.der
   - filename: branding/osx.patch
     enable: '[% c("var/osx") %]'
   - filename: bug-1218193.patch
diff --git a/projects/instantbird/marsigner.der b/projects/instantbird/marsigner.der
new file mode 100644
index 0000000..5f98d36
Binary files /dev/null and b/projects/instantbird/marsigner.der differ
diff --git a/projects/instantbird/marsigner1.der b/projects/instantbird/marsigner1.der
new file mode 100644
index 0000000..a7370bd
Binary files /dev/null and b/projects/instantbird/marsigner1.der differ