Merge pull request #674 from LedgerHQ/misc/apa/fixes

Various QoL changes & small fixes

Author: apaillier-ledger

client/src/ledger_app_clients/ethereum/command_builder.py

@@ -267,21 +267,11 @@ def sign(self, bip32_path: str, rlp_data: bytes, vrs: list) -> list[bytes]:
         payload += rlp_data
         p1 = P1Type.SIGN_FIRST_CHUNK
         while len(payload) > 0:
-            chunk_size = 0xff
-
-            # TODO: Fix the app & remove this, issue #409
-            if len(vrs) == 3:
-                if len(payload) > chunk_size:
-                    import rlp
-                    diff = len(rlp.encode(vrs)) - (len(payload) - chunk_size)
-                    if diff > 0:
-                        chunk_size -= diff
-
             apdus.append(self._serialize(InsType.SIGN,
                                          p1,
                                          0x00,
-                                         payload[:chunk_size]))
-            payload = payload[chunk_size:]
+                                         payload[:0xff]))
+            payload = payload[0xff:]
             p1 = P1Type.SIGN_SUBSQT_CHUNK
         return apdus
 

src/ethUstream.c

@@ -530,19 +530,6 @@ static parserStatus_e processTxInternal(txContext_t *context) {
             PRINTF("parsing is done\n");
             return USTREAM_FINISHED;
         }
-        // Old style transaction (pre EIP-155). Transactions could just skip `v,r,s` so we needed to
-        // cut parsing here. commandLength == 0 could happen in two cases :
-        // 1. We are in an old style transaction : just return `USTREAM_FINISHED`.
-        // 2. We are at the end of an APDU in a multi-apdu process. This would make us return
-        // `USTREAM_FINISHED` preemptively. Case number 2 should NOT happen as it is up to
-        // `ledgerjs` to correctly decrease the size of the APDU (`commandLength`) so that this
-        // situation doesn't happen.
-        if ((context->txType == LEGACY && context->currentField == LEGACY_RLP_V) &&
-            (context->commandLength == 0)) {
-            context->content->vLength = 0;
-            PRINTF("finished\n");
-            return USTREAM_FINISHED;
-        }
         if (context->commandLength == 0) {
             PRINTF("Command length done\n");
             return USTREAM_PROCESSING;

src/ledger_pki.c

@@ -1,8 +1,5 @@
 #include "apdu_constants.h"
 #include "public_keys.h"
-#ifdef HAVE_LEDGER_PKI
-#include "os_pki.h"
-#endif
 
 #define KEY_USAGE_STR(x)                                                               \
     (x == CERTIFICATE_PUBLIC_KEY_USAGE_GENUINE_CHECK          ? "GENUINE_CHECK"        \

src/mem.c

@@ -10,6 +10,7 @@
 
 #include <stdint.h>
 #include "mem.h"
+#include "os_print.h"
 
 #define SIZE_MEM_BUFFER 10240
 
@@ -42,6 +43,7 @@ void mem_reset(void) {
 void *mem_alloc(size_t size) {
     if ((mem_idx + size) > SIZE_MEM_BUFFER)  // Buffer exceeded
     {
+        PRINTF("Error: mem_alloc(%u) failed!\n", size);
         return NULL;
     }
     mem_idx += size;

src/network.c

@@ -6,7 +6,7 @@
 #include "shared_context.h"
 #include "common_utils.h"
 
-static const char *unknown_ticker = "???";
+const char g_unknown_ticker[] = "???";
 
 // Mapping of chain ids to networks.
 static const network_info_t NETWORK_MAPPING[] = {
@@ -111,18 +111,21 @@ static const network_info_t NETWORK_MAPPING[] = {
 };
 
 static const network_info_t *get_network_from_chain_id(const uint64_t *chain_id) {
-    // Look if the network is available
-    for (size_t i = 0; i < MAX_DYNAMIC_NETWORKS; i++) {
-        if (DYNAMIC_NETWORK_INFO[i].chain_id == *chain_id) {
-            PRINTF("[NETWORK] - Found dynamic %s\n", DYNAMIC_NETWORK_INFO[i].name);
-            return (const network_info_t *) &DYNAMIC_NETWORK_INFO[i];
+    if (*chain_id != 0) {
+        // Look if the network is available
+        for (size_t i = 0; i < MAX_DYNAMIC_NETWORKS; i++) {
+            if (DYNAMIC_NETWORK_INFO[i].chain_id == *chain_id) {
+                PRINTF("[NETWORK] - Found dynamic %s\n", DYNAMIC_NETWORK_INFO[i].name);
+                return (const network_info_t *) &DYNAMIC_NETWORK_INFO[i];
+            }
         }
-    }
-    // Fallback to hardcoded table
-    for (size_t i = 0; i < ARRAYLEN(NETWORK_MAPPING); i++) {
-        if (NETWORK_MAPPING[i].chain_id == *chain_id) {
-            PRINTF("[NETWORK] - Fallback on hardcoded list. Found %s\n", NETWORK_MAPPING[i].name);
-            return (const network_info_t *) &NETWORK_MAPPING[i];
+        // Fallback to hardcoded table
+        for (size_t i = 0; i < ARRAYLEN(NETWORK_MAPPING); i++) {
+            if (NETWORK_MAPPING[i].chain_id == *chain_id) {
+                PRINTF("[NETWORK] - Fallback on hardcoded list. Found %s\n",
+                       NETWORK_MAPPING[i].name);
+                return (const network_info_t *) &NETWORK_MAPPING[i];
+            }
         }
     }
     return NULL;
@@ -177,7 +180,7 @@ const char *get_displayable_ticker(const uint64_t *chain_id, const chain_config_
         if (*chain_id == chain_cfg->chainId) {
             ticker = chain_cfg->coinName;
         } else {
-            ticker = unknown_ticker;
+            ticker = g_unknown_ticker;
         }
     }
     return ticker;

src/network.h

@@ -24,6 +24,7 @@ typedef struct network_info_s {
     } while (0)
 
 extern network_info_t DYNAMIC_NETWORK_INFO[];
+extern const char g_unknown_ticker[];
 
 const char *get_network_name_from_chain_id(const uint64_t *chain_id);
 const char *get_network_ticker_from_chain_id(const uint64_t *chain_id);

src/public_keys.h

@@ -16,7 +16,11 @@
  ********************************************************************************/
 
 #pragma once
+
 #include <stdint.h>
+#ifdef HAVE_LEDGER_PKI
+#include "os_pki.h"
+#endif
 
 static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = {
 #if defined(HAVE_CAL_TEST_KEY)
@@ -105,13 +109,13 @@ static const uint8_t LEDGER_NFT_SELECTOR_PUBLIC_KEY[] = {
 #endif
 };
 
-extern int check_signature_with_pubkey(const char *tag,
-                                       uint8_t *buffer,
-                                       const uint8_t bufLen,
-                                       const uint8_t *PubKey,
-                                       const uint8_t keyLen,
+int check_signature_with_pubkey(const char *tag,
+                                uint8_t *buffer,
+                                const uint8_t bufLen,
+                                const uint8_t *PubKey,
+                                const uint8_t keyLen,
 #ifdef HAVE_LEDGER_PKI
-                                       const uint8_t keyUsageExp,
+                                const uint8_t keyUsageExp,
 #endif
-                                       uint8_t *signature,
-                                       const uint8_t sigLen);
+                                uint8_t *signature,
+                                const uint8_t sigLen);

src_features/provideNFTInformation/cmd_provideNFTInfo.c

@@ -61,10 +61,6 @@ uint16_t handleProvideNFTInformation(const uint8_t *workBuffer,
 
     PRINTF("In handle provide NFTInformation\n");
 
-    if ((pluginType != ERC721) && (pluginType != ERC1155)) {
-        PRINTF("NFT metadata provided without proper plugin loaded!\n");
-        return APDU_RESPONSE_CONDITION_NOT_SATISFIED;
-    }
     nft = &get_current_asset_info()->nft;
 
     PRINTF("Provisioning currentAssetIndex %d\n", tmpCtx.transactionContext.currentAssetIndex);

src_features/signMessageEIP712/ui_logic.c

@@ -20,6 +20,7 @@
 #include "uint_common.h"
 #include "filtering.h"
 #include "trusted_name.h"
+#include "network.h"
 
 #define AMOUNT_JOIN_FLAG_TOKEN (1 << 0)
 #define AMOUNT_JOIN_FLAG_VALUE (1 << 1)
@@ -449,12 +450,14 @@ static bool ui_712_format_amount_join(void) {
         ismaxint(ui_ctx->amount.joins[ui_ctx->amount.idx].value,
                  ui_ctx->amount.joins[ui_ctx->amount.idx].value_length)) {
         strlcpy(strings.tmp.tmp, "Unlimited ", sizeof(strings.tmp.tmp));
-        strlcat(strings.tmp.tmp, (token != NULL) ? token->ticker : "???", sizeof(strings.tmp.tmp));
+        strlcat(strings.tmp.tmp,
+                (token != NULL) ? token->ticker : g_unknown_ticker,
+                sizeof(strings.tmp.tmp));
     } else {
         if (!amountToString(ui_ctx->amount.joins[ui_ctx->amount.idx].value,
                             ui_ctx->amount.joins[ui_ctx->amount.idx].value_length,
                             (token != NULL) ? token->decimals : 0,
-                            (token != NULL) ? token->ticker : "???",
+                            (token != NULL) ? token->ticker : g_unknown_ticker,
                             strings.tmp.tmp,
                             sizeof(strings.tmp.tmp))) {
             return false;

src_features/signTx/cmd_signTx.c

@@ -12,10 +12,6 @@ uint16_t handleSign(uint8_t p1,
     uint16_t sw = APDU_NO_RESPONSE;
     cx_err_t error = CX_INTERNAL_ERROR;
 
-    if (os_global_pin_is_validated() != BOLOS_UX_OK) {
-        PRINTF("Device is PIN-locked");
-        return APDU_RESPONSE_SECURITY_NOT_SATISFIED;
-    }
     if (p1 == P1_FIRST) {
         if (appState != APP_STATE_IDLE) {
             reset_app_context();