Merge pull request #28 from Zondax/update_edgeware

Update edgeware
Zondax · Jan 22, 2022 · d0d0d11 · d0d0d11
2 parents be1f93f + 3ff80e6
commit d0d0d11
Show file tree

Hide file tree

Showing 16 changed files with 1,373 additions and 953 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=1
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=46
 # This is the patch version of this release
-APPVERSION_P=3
+APPVERSION_P=4
diff --git a/app/src/common/actions.h b/app/src/common/actions.h
@@ -88,17 +88,16 @@ __Z_INLINE zxerr_t app_fill_address(key_kind_e addressKind) {
 }
 
 __Z_INLINE key_kind_e get_key_type(uint8_t num) {
-#ifdef SUPPORT_SR25519
     switch (num) {
         case 0x00:
             return key_ed25519;
+#ifdef SUPPORT_SR25519
         case 0x01:
             return key_sr25519;
-    }
-    return 0xff;
-#else
-    return key_ed25519;
 #endif
+        default:
+            return 0xff;
+    }
 }
 
 __Z_INLINE void app_reply_error() {

diff --git a/app/src/common/app_main.c b/app/src/common/app_main.c
@@ -45,8 +45,9 @@ unsigned char io_event(unsigned char channel) {
             break;
 
         case SEPROXYHAL_TAG_DISPLAY_PROCESSED_EVENT:
-            if (!UX_DISPLAYED())
+            if (!UX_DISPLAYED()) {
                 UX_DISPLAYED_EVENT();
+            }
             break;
 
         case SEPROXYHAL_TAG_TICKER_EVENT: { //

diff --git a/app/src/crypto.c b/app/src/crypto.c
@@ -76,6 +76,13 @@ zxerr_t crypto_extractPublicKey(key_kind_e addressKind, const uint32_t path[HDPA
                     return zxerr_invalid_crypto_settings;
             }
         }
+        CATCH_ALL
+        {
+            MEMZERO(&cx_privateKey, sizeof(cx_privateKey));
+            MEMZERO(privateKeyData, SK_LEN_25519);
+            CLOSE_TRY;
+            return zxerr_unknown;
+        }
         FINALLY
         {
             MEMZERO(&cx_privateKey, sizeof(cx_privateKey));
@@ -141,10 +148,11 @@ zxerr_t crypto_sign_ed25519(uint8_t *signature, uint16_t signatureMaxlen,
         CATCH_ALL
         {
             MEMZERO(&cx_privateKey, sizeof(cx_privateKey));
+            MEMZERO(privateKeyData, SK_LEN_25519);
             *signatureLen = 0;
             CLOSE_TRY;
             return zxerr_unknown;
-        };
+        }
         FINALLY
         {
             MEMZERO(&cx_privateKey, sizeof(cx_privateKey));

diff --git a/app/src/parser.c b/app/src/parser.c
@@ -129,7 +129,7 @@ parser_error_t parser_getItem(const parser_context_t *ctx,
     CHECK_PARSER_ERR(parser_getNumItems(ctx, &numItems))
     CHECK_APP_CANARY()
 
-    if (displayIdx < 0 || displayIdx >= numItems) {
+    if (displayIdx >= numItems) {
         return parser_no_data;
     }
 

diff --git a/app/src/substrate_types.c b/app/src/substrate_types.c
@@ -537,7 +537,6 @@ parser_error_t _toStringTupleDataData(
         CHECK_ERROR(_toStringData(&v->data2, outValue, outValueLen, pageIdx, &pages[1]))
         return parser_ok;
     }
-    // pageIdx -= pages[1];
 
     return parser_display_idx_out_of_range;
 }

diff --git a/app/src/substrate_types_V1.c b/app/src/substrate_types_V1.c
@@ -728,7 +728,6 @@ parser_error_t _toStringAccountVoteSplit_V1(
         CHECK_ERROR(_toStringBalanceOf(&v->nay, outValue, outValueLen, pageIdx, &pages[2]));
         return parser_ok;
     }
-    // pageIdx -= pages[2];
 
     /////////
     /////////
@@ -782,7 +781,6 @@ parser_error_t _toStringAccountVoteStandard_V1(
         CHECK_ERROR(_toStringBalanceOf(&v->balance, outValue, outValueLen, pageIdx, &pages[2]));
         return parser_ok;
     }
-    // pageIdx -= pages[2];
 
     /////////
     /////////
@@ -1155,7 +1153,6 @@ parser_error_t _toStringIdentityInfo_V1(
         CHECK_ERROR(_toStringData(&v->twitter, outValue, outValueLen, pageIdx, &pages[8]))
         return parser_ok;
     }
-    // pageIdx -= pages[8];
 
     return parser_display_idx_out_of_range;
 }

diff --git a/deps/ledger-zxlib/app/common/view.c b/deps/ledger-zxlib/app/common/view.c
@@ -185,7 +185,6 @@ zxerr_t h_review_update_data() {
         zemu_log_stack("h_review_update_data - GetNumItems==NULL");
         return zxerr_no_data;
     }
-
     if (viewdata.viewfuncGetItem == NULL) {
         zemu_log_stack("h_review_update_data - GetItem==NULL");
         return zxerr_no_data;

diff --git a/deps/ledger-zxlib/cmake/gtest/CMakeLists.txt.gtest.in b/deps/ledger-zxlib/cmake/gtest/CMakeLists.txt.gtest.in
@@ -6,7 +6,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
         GIT_REPOSITORY    https://github.com/google/googletest.git
-        GIT_TAG           master
+        GIT_TAG           release-1.11.0
         SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
         BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
         CONFIGURE_COMMAND ""