From 8ddcd74080d06aad51c3a42eca177050d9e3739b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sun, 1 Oct 2017 17:46:58 +0200
Subject: [PATCH] build: sign all stuff using ed25519 cosi (2 out of 3)

---
 Makefile                    |   4 ++--
 SConscript.bootloader       |   2 +-
 SConscript.firmware         |   2 +-
 assets/satoshilabs_120.toif | Bin 4237 -> 0 bytes
 assets/vendor_devel.png     | Bin 0 -> 10752 bytes
 assets/vendor_devel.toif    | Bin 0 -> 5115 bytes
 embed/boardloader/main.c    |   2 +-
 embed/bootloader/main.c     |   2 +-
 tools/binctl                |  34 +++++++++++++++++++++++++++++++---
 tools/ed25519cosi.py        |  20 +++++++++-----------
 tools/ed25519raw.py         |  10 +++++-----
 11 files changed, 51 insertions(+), 25 deletions(-)
 delete mode 100644 assets/satoshilabs_120.toif
 create mode 100644 assets/vendor_devel.png
 create mode 100644 assets/vendor_devel.toif

diff --git a/Makefile b/Makefile
index 27db3664f0..f6b156e5f3 100644
--- a/Makefile
+++ b/Makefile
@@ -149,8 +149,8 @@ gdb_firmware: $(FIRMWARE_BUILD_DIR)/firmware.elf ## start remote gdb session to
 ## misc commands:
 
 vendorheader: ## construct default vendor header
-	./tools/build_vendorheader 'e28a8970753332bd72fef413e6b0b2ef1b4aadda7aa2c141f233712a6876b351:d4eec1869fb1b8a4e817516ad5a931557cb56805c3eb16e8f3a803d647df7869:772c8a442b7db06e166cfbc1ccbcbcde6f3eba76a4e98ef3ffc519502237d6ef' 1 0.0 SatoshiLabs assets/satoshilabs_120.toif embed/firmware/vendorheader.bin
-	./tools/binctl embed/firmware/vendorheader.bin -s 1 4444444444444444444444444444444444444444444444444444444444444444
+	./tools/build_vendorheader 'e28a8970753332bd72fef413e6b0b2ef1b4aadda7aa2c141f233712a6876b351:d4eec1869fb1b8a4e817516ad5a931557cb56805c3eb16e8f3a803d647df7869:772c8a442b7db06e166cfbc1ccbcbcde6f3eba76a4e98ef3ffc519502237d6ef' 2 0.0 DEVEL assets/vendor_devel.toif embed/firmware/vendorheader.bin
+	./tools/binctl embed/firmware/vendorheader.bin -s 1:2 4444444444444444444444444444444444444444444444444444444444444444:4545454545454545454545454545454545454545454545454545454545454545
 
 binctl: ## print info about binary files
 	./tools/binctl $(BOOTLOADER_BUILD_DIR)/bootloader.bin
diff --git a/SConscript.bootloader b/SConscript.bootloader
index 42e2137f31..5674a2a4ce 100644
--- a/SConscript.bootloader
+++ b/SConscript.bootloader
@@ -169,5 +169,5 @@ program_bin = env.Command(
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
-        '$BINCTL $TARGET -s 1 4141414141414141414141414141414141414141414141414141414141414141',
+        '$BINCTL $TARGET -s 1:2 4141414141414141414141414141414141414141414141414141414141414141:4242424242424242424242424242424242424242424242424242424242424242',
     ], )
diff --git a/SConscript.firmware b/SConscript.firmware
index 944fdb9df7..3b0eed0463 100644
--- a/SConscript.firmware
+++ b/SConscript.firmware
@@ -434,7 +434,7 @@ program_bin = env.Command(
     source=program_elf,
     action=[
         '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET',
-        '$BINCTL $TARGET -s 1 4747474747474747474747474747474747474747474747474747474747474747',
+        '$BINCTL $TARGET -s 1:2 4747474747474747474747474747474747474747474747474747474747474747:4848484848484848484848484848484848484848484848484848484848484848',
     ], )
 
 program0_bin = env.Command(
diff --git a/assets/satoshilabs_120.toif b/assets/satoshilabs_120.toif
deleted file mode 100644
index e7711ba098715a14e095e95ddc8a1f28dd188beb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4237
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

diff --git a/assets/vendor_devel.png b/assets/vendor_devel.png
new file mode 100644
index 0000000000000000000000000000000000000000..9014bddd1f162e365a4b409612d4d923d774ec3d
GIT binary patch
literal 10752
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

literal 0
HcmV?d00001

diff --git a/assets/vendor_devel.toif b/assets/vendor_devel.toif
new file mode 100644
index 0000000000000000000000000000000000000000..e48671041039c836d4ad853aa8b0436d5bc18800
GIT binary patch
literal 5115
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

literal 0
HcmV?d00001

diff --git a/embed/boardloader/main.c b/embed/boardloader/main.c
index 647461337e..a0bc8626b5 100644
--- a/embed/boardloader/main.c
+++ b/embed/boardloader/main.c
@@ -104,7 +104,7 @@ bool copy_sdcard(void)
     return true;
 }
 
-const uint8_t BOARDLOADER_KEY_M = 1;
+const uint8_t BOARDLOADER_KEY_M = 2;
 const uint8_t BOARDLOADER_KEY_N = 3;
 static const uint8_t * const BOARDLOADER_KEYS[] = {
     (const uint8_t *)"\xdb\x99\x5f\xe2\x51\x69\xd1\x41\xca\xb9\xbb\xba\x92\xba\xa0\x1f\x9f\x2e\x1e\xce\x7d\xf4\xcb\x2a\xc0\x51\x90\xf3\x7f\xcc\x1f\x9d",
diff --git a/embed/bootloader/main.c b/embed/bootloader/main.c
index 451c7770ac..05f90ab581 100644
--- a/embed/bootloader/main.c
+++ b/embed/bootloader/main.c
@@ -47,7 +47,7 @@ void display_vendor(const uint8_t *vimg, const char *vstr, uint32_t vstr_len, ui
     display_refresh();
 }
 
-const uint8_t BOOTLOADER_KEY_M = 1;
+const uint8_t BOOTLOADER_KEY_M = 2;
 const uint8_t BOOTLOADER_KEY_N = 3;
 static const uint8_t * const BOOTLOADER_KEYS[] = {
     (const uint8_t *)"\xd7\x59\x79\x3b\xbc\x13\xa2\x81\x9a\x82\x7c\x76\xad\xb6\xfb\xa8\xa4\x9a\xee\x00\x7f\x49\xf2\xd0\x99\x2d\x99\xb8\x25\xad\x2c\x48",
diff --git a/tools/binctl b/tools/binctl
index bb3b8fb979..e6571d9cd6 100755
--- a/tools/binctl
+++ b/tools/binctl
@@ -8,16 +8,36 @@ import binascii
 import pyblake2
 
 import ed25519raw
+import ed25519cosi
 
 
 def sign_data(seckeys, data):
+    digest = pyblake2.blake2s(data).digest()
     if len(seckeys) == 1:
         sk = seckeys[0]
         pk = ed25519raw.publickey(sk)
-        digest = pyblake2.blake2s(data).digest()
         return ed25519raw.signature(digest, sk, pk)
     else:
-        raise NotImplementedError
+        pubkeys = [ed25519raw.publickey(sk) for sk in seckeys]
+        ctr = 0
+        nonces = []
+        commits = []
+        for sk in seckeys:
+            r, R = ed25519cosi.get_nonce(sk, digest, ctr)
+            nonces.append(r)
+            commits.append(R)
+        global_pk = ed25519cosi.combine_keys(pubkeys)
+        global_R = ed25519cosi.combine_keys(commits)
+        sigs = []
+        for sk, r, R in zip(seckeys, nonces, commits):
+            h = ed25519raw.H(sk)
+            b = ed25519raw.b
+            a = 2**(b - 2) + sum(2**i * ed25519raw.bit(h, i) for i in range(3, b - 2))
+            S = (r + ed25519raw.Hint(global_R + global_pk + digest) * a) % ed25519raw.l
+            sigs.append(ed25519raw.encodeint(S))
+        sig = ed25519cosi.combine_sig(global_R, sigs)
+        ed25519raw.checkvalid(sig, digest, global_pk)
+        return sig
 
 
 def format_sigmask(sigmask):
@@ -186,6 +206,14 @@ class VendorHeader(object):
         return header
 
     def sign(self, sigmask, seckeys):
+        # check whether provided arguments match vsig_m/vsig_n
+        if len(seckeys) != self.vsig_m:
+            raise Exception('invalid number of signatures (vsig_m expected %d, got %d)' % (self.vsig_m, len(seckeys)))
+        if sigmask >= (1 << self.vsig_n):
+            raise Exception('signature index is higher than vsig_n (%d)' % self.vsig_n)
+        if bin(sigmask).count('1') != self.vsig_m:
+            raise Exception('invalid number of indexes (vsig_m expected %d, got %d)' % (self.vsig_m, bin(sigmask).count('1')))
+        # sign
         header = self.serialize_header(sig=False)
         self.sigmask = sigmask
         self.sig = sign_data(seckeys, header)
@@ -224,7 +252,7 @@ def main():
         sigmask = 0
         if ':' in sys.argv[3]:
             for idx in sys.argv[3].split(':'):
-                sigmask = 1 << (int(idx) - 1)
+                sigmask |= 1 << (int(idx) - 1)
         else:
             sigmask = 1 << (int(sys.argv[3]) - 1)
         if ':' in sys.argv[4]:
diff --git a/tools/ed25519cosi.py b/tools/ed25519cosi.py
index a056c48336..9b4317b24b 100644
--- a/tools/ed25519cosi.py
+++ b/tools/ed25519cosi.py
@@ -220,17 +220,17 @@ def test(data):
         sks.append(seckey)
         pks.append(pubkey)
         ctr = 0
-        (r, R) = get_nonce(seckey, digest, ctr)
+        r, R = get_nonce(seckey, digest, ctr)
         print('Local nonce:  %s' % hex(ed25519raw.encodeint(r)))
         print('Local commit: %s' % hex(R))
         nonces.append(r)
         commits.append(R)
 
-    globalPk = combine_keys([pks[i] for i in keyset])
-    globalR = combine_keys([commits[i] for i in keyset])
+    global_pk = combine_keys([pks[i] for i in keyset])
+    global_R = combine_keys([commits[i] for i in keyset])
     print('-----------------')
-    print('Global pubkey: %s' % hex(globalPk))
-    print('Global commit: %s' % hex(globalR))
+    print('Global pubkey: %s' % hex(global_pk))
+    print('Global commit: %s' % hex(global_R))
     print('-----------------')
 
     for i in range(0, N):
@@ -240,17 +240,15 @@ def test(data):
         R = commits[i]
         h = ed25519raw.H(seckey)
         b = ed25519raw.b
-        a = 2**(b - 2) + sum(2**i * ed25519raw.bit(h, i)
-                             for i in range(3, b - 2))
-        S = (r + ed25519raw.Hint(globalR + globalPk + digest) * a) % ed25519raw.l
+        a = 2**(b - 2) + sum(2**i * ed25519raw.bit(h, i) for i in range(3, b - 2))
+        S = (r + ed25519raw.Hint(global_R + global_pk + digest) * a) % ed25519raw.l
         print('Local sig %d: %s' % (i + 1, hex(ed25519raw.encodeint(S))))
-        commits.append(R)
         sigs.append(ed25519raw.encodeint(S))
 
     print('-----------------')
-    sig = combine_sig(globalR, [sigs[i] for i in keyset])
+    sig = combine_sig(global_R, [sigs[i] for i in keyset])
     print('Global sig: %s' % hex(sig))
-    ed25519raw.checkvalid(sig, digest, globalPk)
+    ed25519raw.checkvalid(sig, digest, global_pk)
     print('Valid Signature!')
 
 
diff --git a/tools/ed25519raw.py b/tools/ed25519raw.py
index 2fd060a9a4..24c7d68711 100644
--- a/tools/ed25519raw.py
+++ b/tools/ed25519raw.py
@@ -14,7 +14,7 @@ def H(m):
 
 def expmod(b, e, m):
     if e < 0:
-        raise Exception("negative exponent")
+        raise Exception('negative exponent')
     if e == 0:
         return 1
     t = expmod(b, e >> 1, m)**2 % m
@@ -120,18 +120,18 @@ def decodepoint(s):
         x = q - x
     P = [x, y]
     if not isoncurve(P):
-        raise Exception("decoding point that is not on curve")
+        raise Exception('decoding point that is not on curve')
     return P
 
 
 def checkvalid(s, m, pk):
     if len(s) != b >> 2:
-        raise Exception("signature length is wrong")
+        raise Exception('signature length is wrong')
     if len(pk) != b >> 3:
-        raise Exception("public-key length is wrong")
+        raise Exception('public-key length is wrong')
     R = decodepoint(s[0:b >> 3])
     A = decodepoint(pk)
     S = decodeint(s[b >> 3:b >> 2])
     h = Hint(encodepoint(R) + pk + m)
     if scalarmult(B, S) != edwards(R, scalarmult(A, h)):
-        raise Exception("signature does not pass verification")
+        raise Exception('signature does not pass verification')