Merge pull request #50 from Zondax/tx_rejected

Tx rejected

Author: jleni

.gdbinit

@@ -0,0 +1,11 @@
+# https://www.jetbrains.com/help/clion/configuring-debugger-options.html#gdbinit-lldbinit
+#
+# You need to create `$HOME/.gdbinit` with the following content:
+# set auto-load local-gdbinit on
+# add-auto-load-safe-path /
+
+set architecture arm
+handle SIGILL nostop pass noprint
+add-symbol-file app/bin/app.elf 0x40000000
+set backtrace limit 20
+b *0x40000000

CMakeLists.txt

@@ -30,8 +30,8 @@ string(APPEND CMAKE_LINKER_FLAGS " -fsanitize=address -fno-omit-frame-pointer")
 ##############################################################
 #  static libs
 file(GLOB_RECURSE TINYCBOR_SRC
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor/src/cborparser.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor/src/cborvalidation.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor-ledger/cborparser.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor-ledger/cborvalidation.c
         )
 
 file(GLOB_RECURSE LIB_SRC
@@ -68,7 +68,7 @@ target_compile_definitions(app_val_lib PRIVATE APP_VALIDATOR)
 
 target_include_directories(app_lib PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor/src
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor-ledger
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/sha512
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/consumer
@@ -105,7 +105,7 @@ target_include_directories(unittests PUBLIC
         ${gmock_SOURCE_DIR}/include
         ${CONAN_INCLUDE_DIRS_FMT}
         ${CONAN_INCLUDE_DIRS_JSONCPP}
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor/src
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/tinycbor-ledger
         ${CMAKE_CURRENT_SOURCE_DIR}/tests/utils
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/include
         )

app/Makefile

@@ -22,6 +22,11 @@ endif
 
 MY_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
+ifeq ($(APP_TESTING),1)
+DEFINES += APP_TESTING
+DEFINES += ZEMU_LOGGING
+endif
+
 all: bin/app.elf
 	@echo "#!/usr/bin/env bash" > $(CURDIR)/pkg/zxtool.sh
 	@echo "APPNAME=\"${APPNAME}\"" >> $(CURDIR)/pkg/zxtool.sh
@@ -36,15 +41,15 @@ all: bin/app.elf
 	@chmod +x $(CURDIR)/pkg/zxtool.sh
 
 include $(BOLOS_SDK)/Makefile.defines
-#DEFINES += ZEMU_LOGGING
+DEFINES += NDEBUG
 
 ifndef COIN
 COIN=oasis
 endif
 
 APPVERSION_M=1
 APPVERSION_N=5
-APPVERSION_P=0
+APPVERSION_P=1
 
 $(info COIN  = [$(COIN)])
 ifeq ($(COIN),oasis)
@@ -123,7 +128,7 @@ DEFINES       += HAVE_UX_FLOW
 
 else
 # Assume Nano S
-DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=64
+DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 DEFINES       += HAVE_BOLOS_UX COMPLIANCE_UX_160 HAVE_UX_LEGACY HAVE_UX_FLOW
 endif
 

app/script_con.ld

@@ -30,7 +30,7 @@ MEMORY
 }
 
 PAGE_SIZE  = 64;
-STACK_SIZE = 2448;
+STACK_SIZE = 2392;
 END_STACK  = ORIGIN(SRAM) + LENGTH(SRAM);
 
 SECTIONS

app/src/common/parser_common.h

@@ -36,6 +36,7 @@ typedef enum {
     parser_display_page_out_of_range,
     parser_unexepected_error,
     // Coin generic
+    parser_root_item_should_be_a_map,
     parser_unexpected_type,
     parser_unexpected_method,
     parser_unexpected_buffer_end,
@@ -61,6 +62,7 @@ typedef enum {
     // Required fields
     parser_required_nonce,
     parser_required_method,
+    parser_required_body,
     // Amino related
     parser_unexpected_wire_type,
     parser_unexpected_round_value,

app/src/consumer/cbor_helper.h

@@ -32,6 +32,7 @@ __Z_INLINE parser_error_t parser_mapCborError(CborError err) {
 
 #define CHECK_CBOR_ERR(CALL) { \
     CborError err = CALL;  \
+    check_app_canary(); \
     if (err!=CborNoError) return parser_mapCborError(err);}
 
 #define CHECK_CBOR_TYPE(type, expected) {if (type!=expected) return parser_unexpected_type;}

app/src/consumer/parser_consumer.c

@@ -36,7 +36,9 @@ void __assert_fail(const char * assertion, const char * file, unsigned int line,
 parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data, size_t dataLen) {
     CHECK_PARSER_ERR(parser_init(ctx, data, dataLen))
     CHECK_PARSER_ERR(_readContext(ctx, &parser_tx_obj))
-    return _read(ctx, &parser_tx_obj);
+    CHECK_PARSER_ERR(_read(ctx, &parser_tx_obj));
+    CHECK_PARSER_ERR(_extractContextSuffix(&parser_tx_obj))
+    return parser_ok;
 }
 
 parser_error_t parser_validate(const parser_context_t *ctx) {