Merge pull request #4 from Zondax/dev

Fix integration issue
Zondax · Jul 21, 2022 · 7b814e0 · 7b814e0
2 parents 2cbf328 + 81ddee1
commit 7b814e0
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/src/common/actions.h b/app/src/common/actions.h
@@ -49,8 +49,8 @@ __Z_INLINE void app_sign() {
         set_code(G_io_apdu_buffer, 0, APDU_CODE_SIGN_VERIFY_ERROR);
         io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, 2);
     } else {
-        set_code(G_io_apdu_buffer, SIG_PLUS_TYPE_LEN, APDU_CODE_OK);
-        io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, SIG_PLUS_TYPE_LEN + 2);
+        set_code(G_io_apdu_buffer, SK_LEN_25519, APDU_CODE_OK);
+        io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, SK_LEN_25519 + 2);
     }
 }
 

diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
@@ -169,7 +169,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
@@ -202,7 +202,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
@@ -235,7 +235,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
@@ -268,7 +268,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
@@ -301,7 +301,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
@@ -334,7 +334,7 @@ describe('Standard', function () {
 
       // Now verify the signature
       const prehash = Buffer.concat([Buffer.from('TX'), txBlob]);
-      const valid = ed25519.verify(signatureResponse.signature.slice(0, -1), prehash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, prehash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()