Merge pull request #44 from LedgerHQ/develop

Stable release v2.3.2

Makefile

@@ -24,8 +24,8 @@ GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2
 
 VERSION_TAG ?= $(shell echo "$(GIT_DESCRIBE)" | cut -f1 -d-)
 APPVERSION_M=2
-APPVERSION_N=2
-APPVERSION_P=15
+APPVERSION_N=3
+APPVERSION_P=2
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 # Only warn about version tags if specified/inferred

src/apdu.c

@@ -11,6 +11,11 @@ size_t provide_pubkey(uint8_t *const io_buffer, cx_ecfp_public_key_t const *cons
     check_null(io_buffer);
     check_null(pubkey);
     size_t tx = 0;
+    // Application could be PIN-locked, and pubkey->W_len would then be 0,
+    // so throwing an error rather than returning an empty key
+    if (os_global_pin_is_validated() != BOLOS_UX_OK) {
+        THROW(EXC_SECURITY);
+    }
     io_buffer[tx++] = pubkey->W_len;
     memmove(io_buffer + tx, pubkey->W, pubkey->W_len);
     tx += pubkey->W_len;

src/globals.h

@@ -13,7 +13,7 @@ void clear_apdu_globals(void);
 // Zeros out all application-specific globals and SDK-specific UI/exchange buffers.
 void init_globals(void);
 
-#define MAX_APDU_SIZE 230  // Maximum number of bytes in a single APDU
+#define MAX_APDU_SIZE 235  // Maximum number of bytes in a single APDU
 
 // Our buffer must accommodate any remainder from hashing and the next message at once.
 #define TEZOS_BUFSIZE (BLAKE2B_BLOCKBYTES + MAX_APDU_SIZE)

src/swap/handle_swap_sign_transaction.c

@@ -27,6 +27,7 @@ bool copy_transaction_parameters(const create_transaction_parameters_t* params)
 }
 
 void handle_swap_sign_transaction(void) {
+    init_globals();
     called_from_swap = true;
     io_seproxyhal_init();
     USB_power(0);

src/ui_common.c

@@ -38,10 +38,7 @@ void init_screen_stack() {
 }
 
 void require_pin(void) {
-    bolos_ux_params_t params;
-    memset(&params, 0, sizeof(params));
-    params.ux_id = BOLOS_UX_VALIDATE_PIN;
-    os_ux_blocking(&params);
+    os_global_pin_invalidate();
 }
 
 __attribute__((noreturn)) bool exit_app(void) {

tools/BakersRegistryCoreUnfilteredData.json

@@ -494,5 +494,9 @@
   {
     "bakerName": "Money Every 3 Days",
     "bakerAccount": "tz1NEKxGEHsFufk87CVZcrqWu8o22qh46GK6"
+  },
+  {
+    "bakerName": "Eco Tez",
+    "bakerAccount": "tz3e7LbZvUtoXhpUD1yb6wuFodZpfYRb9nWJ"
   }
 ]