Merge pull request #180 from Zondax/fix_signature_candid

Fix signature candid

Author: ftheirs

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the minor version of this release
 APPVERSION_N=1
 # This is the patch version of this release
-APPVERSION_P=6
+APPVERSION_P=7

app/src/crypto.c

@@ -149,6 +149,14 @@ typedef struct {
     cx_hash(&ctx.header, CX_LAST, TMPDIGEST, CX_SHA256_SIZE, ENDDIGEST, CX_SHA256_SIZE);        \
 }
 
+#define HASH_BYTES_PTR_END(FIELDNAME, FIELDVALUE, TMPDIGEST, ENDDIGEST) { \
+    MEMZERO(TMPDIGEST,sizeof(TMPDIGEST));                      \
+    cx_hash_sha256((uint8_t *)FIELDNAME, sizeof(FIELDNAME) - 1, TMPDIGEST, CX_SHA256_SIZE); \
+    cx_hash(&ctx.header, 0, TMPDIGEST, CX_SHA256_SIZE, NULL, 0);         \
+    cx_hash_sha256((uint8_t *)(FIELDVALUE).dataPtr, (FIELDVALUE).len, TMPDIGEST, CX_SHA256_SIZE); \
+    cx_hash(&ctx.header, CX_LAST, TMPDIGEST, CX_SHA256_SIZE, ENDDIGEST, CX_SHA256_SIZE);        \
+}
+
 zxerr_t crypto_getDigest(uint8_t *digest, txtype_e txtype){
     cx_sha256_t ctx;
     cx_sha256_init(&ctx);
@@ -168,7 +176,7 @@ zxerr_t crypto_getDigest(uint8_t *digest, txtype_e txtype){
             if(fields->has_nonce){
                 HASH_BYTES_INTERMEDIATE("nonce", fields->nonce, tmpdigest);
             }
-            HASH_BYTES_END("arg", fields->method_args, tmpdigest, digest);
+            HASH_BYTES_PTR_END("arg", fields->method_args, tmpdigest, digest);
             return zxerr_ok;
         }
         case state_transaction_read: {

app/src/parser_impl.c

@@ -439,6 +439,7 @@ parser_error_t readContent(CborValue *content_map, parser_tx_t *v) {
         } else {
             READ_STRING(content_map, "arg", fields->method_args)
             CHECK_PARSER_ERR(readPayload(v, fields->method_args.data, fields->method_args.len))
+            fields->method_args.dataPtr = fields->method_args.data;
         }
 
     } else if (strcmp(v->request_type.data, "read_state") == 0) {