speculos 0.16.1.dev2__tar.gz → 0.16.1.dev4__tar.gz

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.17.0] 2025-03-13
+
+### Added
+
+- `--save-nvram` and `--load-nvram` parameters that allow NVRAM testing
+- destination boundaries verification for `nvm_write()`
+
 ## [0.16.0] 2025-03-05
 
 ### Changed

{speculos-0.16.1.dev2/speculos.egg-info → speculos-0.16.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: speculos
-Version: 0.16.1.dev2
+Version: 0.16.1.dev4
 Summary: Ledger Blue, Stax, Flex and Nano S/S+/X application emulator
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/speculos

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/speculos/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.16.1.dev2'
-__version_tuple__ = version_tuple = (0, 16, 1, 'dev2')
+__version__ = version = '0.16.1.dev4'
+__version_tuple__ = version_tuple = (0, 16, 1, 'dev4')

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/speculos/main.py

@@ -14,6 +14,7 @@ import signal
 import socket
 import sys
 import threading
+from dataclasses import dataclass
 from elftools.elf.elffile import ELFFile
 from ledgered.binary import LedgerBinaryApp
 from mnemonic import mnemonic
@@ -34,6 +35,25 @@ from .observer import BroadcastInterface
 from .resources_importer import resources
 
 
+@dataclass
+class ElfInfo:
+    text_offset: int = 0
+    text_size: int = 0
+    stack_addr: int = 0
+    stack_size: int = 0
+    ram_addr: int = 0
+    ram_size: int = 0
+    text_addr: int = 0
+    svc_call_addr: int = 0
+    svc_cx_call_addr: int = 0
+    fonts_addr: int = 0
+    fonts_size: int = 0
+    app_nvram_addr: int = 0
+    app_nvram_size: int = 0
+    cx_ram_addr: int = 0
+    cx_ram_size: int = 0
+
+
 DEFAULT_SEED = ('glory promote mansion idle axis finger extra february uncover one trip resource lawn turtle enact '
                 'monster seven myth punch hobby comfort wild raise skin')
 
@@ -51,26 +71,27 @@ def set_pdeath(sig):
 
 
 def get_elf_infos(app_path, use_bagl):
+    ei = ElfInfo()
     with open(app_path, 'rb') as fp:
         elf = ELFFile(fp)
-        text = elf.get_section_by_name('.text')
+        text_section = elf.get_section_by_name('.text')
         for seg in elf.iter_segments():
             if seg['p_type'] != 'PT_LOAD':
                 continue
-            if seg.section_in_segment(text):
+            if seg.section_in_segment(text_section):
                 text_seg = seg
                 break
         else:
             raise RuntimeError("No program header with text section!")
-        symtab = elf.get_section_by_name('.symtab')
-        bss = elf.get_section_by_name('.bss')
-        sh_offset = text_seg['p_offset']
-        sh_size = text_seg['p_filesz']
-        text_load_addr = text['sh_addr']
-        stack = bss['sh_addr']
-        sym_estack = symtab.get_symbol_by_name('_estack')
+        symtab_section = elf.get_section_by_name('.symtab')
+        bss_section = elf.get_section_by_name('.bss')
+        ei.text_offset = text_seg['p_offset']
+        ei.text_size = text_seg['p_filesz']
+        ei.text_addr = text_section['sh_addr']
+        ei.stack_addr = bss_section['sh_addr']
+        sym_estack = symtab_section.get_symbol_by_name('_estack')
         if sym_estack is None:
-            sym_estack = symtab.get_symbol_by_name('END_STACK')
+            sym_estack = symtab_section.get_symbol_by_name('END_STACK')
         if sym_estack is None:
             logger.error('failed to find _estack/END_STACK symbol')
             sys.exit(1)
@@ -78,45 +99,53 @@ def get_elf_infos(app_path, use_bagl):
 
         # Look for the symbols SVC_Call and SVC_cx_call
         # if they are found, save their addresses to patch them to replace the SYSCALL later
-        svc_call_addr = 0
-        svc_cx_call_addr = 0
-        svc_call_symbol = symtab.get_symbol_by_name("SVC_Call")
+        svc_call_symbol = symtab_section.get_symbol_by_name("SVC_Call")
         if svc_call_symbol is not None:
-            svc_call_addr = svc_call_symbol[0]['st_value'] & (~1)
-        svc_cx_call_symbol = symtab.get_symbol_by_name("SVC_cx_call")
+            ei.svc_call_addr = svc_call_symbol[0]['st_value'] & (~1)
+        svc_cx_call_symbol = symtab_section.get_symbol_by_name("SVC_cx_call")
         if svc_cx_call_symbol is not None:
-            svc_cx_call_addr = svc_cx_call_symbol[0]['st_value'] & (~1)
+            ei.svc_cx_call_addr = svc_cx_call_symbol[0]['st_value'] & (~1)
         # Check where are located fonts in .elf file (LNX/LNS+ with BAGL only)
         # (on apps using NBGL, fonts are loaded from a known location: STAX_FONTS_ARRAY_ADDR,
         #  FLEX_FONTS_ARRAY_ADDR, NANOX_FONTS_ARRAY_ADDR or NANOSP_FONTS_ARRAY_ADDR)
-        fonts_addr = 0
-        fonts_size = 0
-        bagl_fonts_symbol = symtab.get_symbol_by_name('C_bagl_fonts')
+        bagl_fonts_symbol = symtab_section.get_symbol_by_name('C_bagl_fonts')
         if bagl_fonts_symbol is not None:
-            fonts_addr = bagl_fonts_symbol[0]['st_value']
-            fonts_size = bagl_fonts_symbol[0]['st_size']
+            ei.fonts_addr = bagl_fonts_symbol[0]['st_value']
+            ei.fonts_size = bagl_fonts_symbol[0]['st_size']
         elif use_bagl:
             logger.info("Disabling OCR.")
 
-        supp_ram = elf.get_section_by_name('.rfbss')
-        ram_addr, ram_size = (supp_ram['sh_addr'], supp_ram['sh_size']) if supp_ram is not None else (0, 0)
-    stack_size = estack - stack
-    return sh_offset, sh_size, stack, stack_size, ram_addr, ram_size, text_load_addr, \
-        svc_call_addr, svc_cx_call_addr, fonts_addr, fonts_size
+        # App NVRAM handling
+        nvram_data_symbol = symtab_section.get_symbol_by_name('_nvram_data')
+        # _envram for applications built with old SDK version
+        envram_data_symbol = symtab_section.get_symbol_by_name('_envram_data') \
+            or symtab_section.get_symbol_by_name('_envram')
+        if nvram_data_symbol is not None and envram_data_symbol is not None:
+            ei.app_nvram_addr = nvram_data_symbol[0]['st_value']
+            ei.app_nvram_size = envram_data_symbol[0]['st_value'] - nvram_data_symbol[0]['st_value']
+        else:
+            logger.info("The application does not use NVRAM.")
+
+        supp_ram_section = elf.get_section_by_name('.rfbss')
+        ei.ram_addr, ei.ram_size = \
+            (supp_ram_section['sh_addr'], supp_ram_section['sh_size']) if supp_ram_section is not None else (0, 0)
+    ei.stack_size = estack - ei.stack_addr
+    return ei
 
 
 def get_cx_infos(app_path):
+    ei = ElfInfo()
     with open(app_path, 'rb') as fp:
         elf = ELFFile(fp)
-        text = elf.get_section_by_name('.text')
-        cxram = elf.get_section_by_name('.cxram')
-        sh_offset = text['sh_offset']
-        sh_size = text['sh_size']
-        sh_load = text['sh_addr']
-        cx_ram_load = cxram["sh_addr"]
-        cx_ram_size = cxram["sh_size"]
+        text_section = elf.get_section_by_name('.text')
+        cxram_section = elf.get_section_by_name('.cxram')
+        ei.text_offset = text_section['sh_offset']
+        ei.text_size = text_section['sh_size']
+        ei.text_addr = text_section['sh_addr']
+        ei.cx_ram_addr = cxram_section["sh_addr"]
+        ei.cx_ram_size = cxram_section["sh_size"]
 
-    return sh_offset, sh_size, sh_load, cx_ram_size, cx_ram_load
+    return ei
 
 
 def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace, use_bagl: bool) -> int:
@@ -147,8 +176,9 @@ def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace, use
         cxlib_filepath = f"cxlib/{args.model}-cx-{args.sdk}.elf"
     cxlib = str(resources.files(__package__) / cxlib_filepath)
     if os.path.exists(cxlib):
-        sh_offset, sh_size, sh_load, cx_ram_size, cx_ram_load = get_cx_infos(cxlib)
-        cxlib_args = f'{cxlib}:{sh_offset:#x}:{sh_size:#x}:{sh_load:#x}:{cx_ram_size:#x}:{cx_ram_load:#x}'
+        ei = get_cx_infos(cxlib)
+        cxlib_args = f'{cxlib}:{ei.text_offset:#x}:{ei.text_size:#x}:{ei.text_addr:#x}'
+        cxlib_args += f':{ei.cx_ram_size:#x}:{ei.cx_ram_addr:#x}'
         argv += ['-c', cxlib_args]
     else:
         logger.warning(f"Cx lib {cxlib_filepath} not found")
@@ -167,21 +197,22 @@ def run_qemu(s1: socket.socket, s2: socket.socket, args: argparse.Namespace, use
     app_path = getattr(args, 'app.elf')
     for lib in [f'main:{app_path}'] + args.library:
         name, lib_path = lib.split(':')
-        load_offset, load_size, stack, stack_size, ram_addr, ram_size, \
-            text_load_addr, svc_call_address, svc_cx_call_address, \
-            fonts_addr, fonts_size = get_elf_infos(lib_path, use_bagl)
+        ei = get_elf_infos(lib_path, use_bagl)
 
         # Since binaries loaded as libs could also declare extra RAM page(s), collect them all
-        if (ram_addr, ram_size) != (0, 0):
-            arg = f'{ram_addr:#x}:{ram_size:#x}'
+        if (ei.ram_addr, ei.ram_size) != (0, 0):
+            arg = f'{ei.ram_addr:#x}:{ei.ram_size:#x}'
             if extra_ram and arg != extra_ram:
                 logger.error("different extra RAM pages for main app and/or libraries!")
                 sys.exit(1)
             extra_ram = arg
-        lib_arg = f'{name}:{lib_path}:{load_offset:#x}:{load_size:#x}'
-        lib_arg += f':{stack:#x}:{stack_size:#x}:{svc_call_address:#x}'
-        lib_arg += f':{svc_cx_call_address:#x}:{text_load_addr:#x}'
-        lib_arg += f':{fonts_addr:#x}:{fonts_size:#x}'
+        lib_arg = f'{name}:{lib_path}:{ei.text_offset:#x}:{ei.text_size:#x}'
+        lib_arg += f':{ei.stack_addr:#x}:{ei.stack_size:#x}:{ei.svc_call_addr:#x}'
+        lib_arg += f':{ei.svc_cx_call_addr:#x}:{ei.text_addr:#x}'
+        lib_arg += f':{ei.fonts_addr:#x}:{ei.fonts_size:#x}'
+        lib_arg += f':{ei.app_nvram_addr:#x}:{ei.app_nvram_size:#x}'
+        lib_arg += f':{1 if args.load_nvram else 0}'
+        lib_arg += f':{1 if args.save_nvram else 0}'
         argv.append(lib_arg)
 
     if args.model == 'blue':
@@ -303,6 +334,8 @@ def main(prog=None) -> int:
                                                         "left button, 'a' right, 's' both). Default: arrow keys")
     group.add_argument('--progressive', action='store_true', help='Enable step-by-step rendering of graphical elements')
     group.add_argument('--zoom', help='Display pixel size.', type=int, choices=range(1, 11))
+    group.add_argument('--load-nvram', action='store_true', help='Preload app NVRAM data from file beforehand')
+    group.add_argument('--save-nvram', action='store_true', help='Save app NVRAM data to file')
 
     if prog:
         parser.prog = prog

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4/speculos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: speculos
-Version: 0.16.1.dev2
+Version: 0.16.1.dev4
 Summary: Ledger Blue, Stax, Flex and Nano S/S+/X application emulator
 Author-email: Ledger <hello@ledger.fr>
 Project-URL: Homepage, https://github.com/LedgerHQ/speculos

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/speculos.egg-info/SOURCES.txt

@@ -219,6 +219,7 @@ src/environment.c
 src/environment.h
 src/fonts.h
 src/launcher.c
+src/launcher.h
 src/sdk.h
 src/svc.c
 src/svc.h

speculos-0.16.1.dev4/src/bolos/default.c

@@ -0,0 +1,84 @@
+#include <err.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <sys/mman.h>
+
+#include "emulate.h"
+#include "launcher.h"
+
+#define PAGE_SIZE 4096
+
+unsigned long sys_os_global_pin_invalidate(void)
+{
+  /* return void actually */
+  return 0;
+}
+
+/*
+ * TODO: ensure that source address is valid.
+ */
+int sys_nvm_write(void *dst_addr, void *src_addr, size_t src_len)
+{
+  ptrdiff_t diff;
+  size_t size;
+  void *p;
+
+  /* Checking the destination boundaries */
+  unsigned long app_nvram_offset =
+      get_app_nvram_address() - get_app_text_load_addr();
+  if ((dst_addr < get_memory_code_address() + app_nvram_offset) ||
+      (dst_addr + src_len >=
+       get_memory_code_address() + app_nvram_offset + get_app_nvram_size())) {
+    errx(1, "App NVRAM write attempt out of boundaries\n");
+  }
+  p = (void *)((unsigned long)dst_addr & (~(PAGE_SIZE - 1)));
+  diff = (ptrdiff_t)dst_addr - (ptrdiff_t)p;
+  size = src_len + diff;
+
+  if (mprotect(p, size, PROT_WRITE) != 0) {
+    err(1, "nvm_write: mprotect(PROT_WRITE)");
+  }
+
+  if (src_addr != NULL) {
+    memcpy(dst_addr, src_addr, src_len);
+  } else {
+    memset(dst_addr, 0, src_len);
+  }
+
+  if (mprotect(p, size, PROT_READ | PROT_EXEC) != 0) {
+    err(1, "nvm_write: mprotect(PROT_READ | PROT_EXEC)");
+  }
+
+  if (get_app_save_nvram()) {
+    /* Writing data to host file */
+    FILE *fptr = fopen(get_app_nvram_file_name(), "r+");
+    if (fptr == NULL) {
+      fptr = fopen(get_app_nvram_file_name(), "w");
+      if (fptr == NULL) {
+        err(1, "Failed to open the app NVRAM file %s\n",
+            get_app_nvram_file_name());
+      }
+    }
+    unsigned long data_offset =
+        dst_addr - (get_memory_code_address() + app_nvram_offset);
+    fseek(fptr, data_offset, SEEK_SET);
+    if (fwrite(src_addr, 1, src_len, fptr) != src_len) {
+      errx(1, "App NVRAM write attempt failed\n");
+    }
+    fclose(fptr);
+  }
+
+  /* XXX: this function return void */
+  return 0xdeadbeef;
+}
+
+int sys_nvm_erase(void *dst_addr, size_t src_len)
+{
+  return sys_nvm_write(dst_addr, NULL, src_len);
+}
+
+int sys_nvm_erase_page(unsigned int page_adr __attribute__((unused)))
+{
+  // TODO !
+  return 0;
+}

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/src/bolos/os.c

@@ -4,6 +4,7 @@
 
 #include "emulate.h"
 #include "environment.h"
+#include "launcher.h"
 #include "svc.h"
 
 #define OS_SETTING_PLANEMODE_OLD 5

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/src/emulate.h

@@ -23,8 +23,6 @@ typedef struct try_context_s try_context_t;
 typedef struct cx_ecfp_256_public_key_s cx_ecfp_public_key_t;
 typedef struct cx_ecfp_256_private_key_s cx_ecfp_private_key_t;
 
-struct app_s;
-
 #define SEPH_FILENO 0 /* 0 is stdin fileno */
 
 #ifndef UNUSED
@@ -124,13 +122,6 @@ unsigned long sys_io_seph_send(const uint8_t *buffer, uint16_t length);
 unsigned long sys_io_seph_recv(uint8_t *buffer, uint16_t maxlength,
                                unsigned int flags);
 
-void unload_running_app(bool unload_data);
-struct app_s *get_current_app(void);
-void save_current_context(struct sigcontext *sigcontext);
-void replace_current_context(struct sigcontext *sigcontext);
-int replace_current_code(struct app_s *app);
-int run_lib(char *name, unsigned long *parameters);
-
 unsigned long sys_try_context_set(try_context_t *context);
 unsigned long sys_try_context_get(void);
 

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/src/launcher.c

@@ -15,6 +15,7 @@
 #include "emulate.h"
 #include "environment.h"
 #include "fonts.h"
+#include "launcher.h"
 #include "svc.h"
 
 #define LOAD_ADDR     ((void *)0x40000000)
@@ -28,6 +29,9 @@
 #define GIT_REVISION "00000000"
 #endif
 
+#define STORAGE_APP_NAME_LEN 30
+const char STORAGE_BACKUP[] = ".backup";
+
 struct elf_info_s {
   unsigned long load_offset;
   unsigned long load_size;
@@ -38,10 +42,15 @@ struct elf_info_s {
   unsigned long text_load_addr;
   unsigned long fonts_addr;
   unsigned long fonts_size;
+  unsigned long app_nvram_addr;
+  unsigned long app_nvram_size;
 };
 
 struct app_s {
   char *name;
+  char nvram_file_name[STORAGE_APP_NAME_LEN];
+  bool load_nvram;
+  bool save_nvram;
   int fd;
   struct elf_info_s elf;
 };
@@ -105,7 +114,8 @@ static struct app_s *search_app_by_name(char *name)
 }
 
 /* open the app file */
-static int open_app(char *name, char *filename, struct elf_info_s *elf)
+static int open_app(char *name, char *filename, struct elf_info_s *elf,
+                    bool load_nvram, bool save_nvram)
 {
   int fd;
 
@@ -126,6 +136,14 @@ static int open_app(char *name, char *filename, struct elf_info_s *elf)
   }
 
   apps[napp].name = name;
+
+  size_t len = STORAGE_APP_NAME_LEN - 1;
+  strncat(apps[napp].nvram_file_name, name, len);
+  len -= strlen(name);
+  strncat(apps[napp].nvram_file_name, "_nvram.bin", len);
+  apps[napp].load_nvram = load_nvram;
+  apps[napp].save_nvram = save_nvram;
+
   apps[napp].fd = fd;
   apps[napp].elf.load_offset = elf->load_offset;
   apps[napp].elf.load_size = elf->load_size;
@@ -136,6 +154,8 @@ static int open_app(char *name, char *filename, struct elf_info_s *elf)
   apps[napp].elf.text_load_addr = elf->text_load_addr;
   apps[napp].elf.fonts_addr = elf->fonts_addr;
   apps[napp].elf.fonts_size = elf->fonts_size;
+  apps[napp].elf.app_nvram_addr = elf->app_nvram_addr;
+  apps[napp].elf.app_nvram_size = elf->app_nvram_size;
 
   napp++;
 
@@ -153,11 +173,41 @@ static void reset_memory(bool unload_data)
   }
 }
 
+void *get_memory_code_address(void)
+{
+  return memory.code;
+}
+
 struct app_s *get_current_app(void)
 {
   return current_app;
 }
 
+char *get_app_nvram_file_name(void)
+{
+  return current_app->nvram_file_name;
+}
+
+bool get_app_save_nvram(void)
+{
+  return current_app->save_nvram;
+}
+
+unsigned long get_app_nvram_address(void)
+{
+  return current_app->elf.app_nvram_addr;
+}
+
+unsigned long get_app_nvram_size(void)
+{
+  return current_app->elf.app_nvram_size;
+}
+
+unsigned long get_app_text_load_addr(void)
+{
+  return current_app->elf.text_load_addr;
+}
+
 // On old versions of the SDK, functions SVC_Call and SVC_cx_call were inlined
 // In this case we can't look for the symbols in the elf to only patch the SVC_1
 // inside of these functions
@@ -402,6 +452,67 @@ static void *load_app(char *name)
     }
   }
 
+  // App NVRAM data update
+  unsigned long app_nvram_offset =
+      app->elf.app_nvram_addr - app->elf.text_load_addr;
+  memset(code + app_nvram_offset, 0, app->elf.app_nvram_size);
+  size_t preload_file_size = 0;
+
+  if (app->load_nvram) {
+    FILE *fptr = fopen(app->nvram_file_name, "rb");
+    if (fptr == NULL) {
+      warnx("App NVRAM file %s is absent\n", app->nvram_file_name);
+      goto error;
+    }
+    fseek(fptr, 0, SEEK_END);
+    long lSize = ftell(fptr);
+    rewind(fptr);
+
+    uint8_t *buffer = (uint8_t *)malloc(sizeof(uint8_t) * lSize);
+    if (buffer == NULL) {
+      warnx("Error to allocate memory for app nvram read\n");
+      fclose(fptr);
+      goto error;
+    }
+    preload_file_size = fread(buffer, 1, lSize, fptr);
+    if (preload_file_size != (size_t)lSize) {
+      warnx("App nvram file size mismatch\n");
+      free(buffer);
+      fclose(fptr);
+      goto error;
+    }
+
+    // The patch
+    memcpy(code + app_nvram_offset, buffer, preload_file_size);
+
+    free(buffer);
+    fclose(fptr);
+  }
+
+  if (app->save_nvram) {
+    /* Let's rename and thus backup the current file if present */
+    char backup_file_name[STORAGE_APP_NAME_LEN + sizeof(STORAGE_BACKUP)] = {
+      0
+    };
+
+    strcpy(backup_file_name, app->nvram_file_name);
+    strcat(backup_file_name, STORAGE_BACKUP);
+    rename(app->nvram_file_name, backup_file_name);
+
+    if (preload_file_size > 0) {
+      /* Let's save the initial content to the new file */
+      FILE *fptr = fopen(app->nvram_file_name, "w");
+      if (fptr == NULL) {
+        err(1, "Failed to open the app NVRAM file %s\n", app->nvram_file_name);
+      }
+      if (fwrite(code + app_nvram_offset, 1, preload_file_size, fptr) !=
+          preload_file_size) {
+        errx(1, "App NVRAM write attempt failed\n");
+      }
+      fclose(fptr);
+    }
+  }
+
   if (mprotect(code, size, PROT_READ | PROT_EXEC) != 0) {
     warn("could not update mprotect in rx mode for app");
     goto error;
@@ -606,12 +717,15 @@ int run_lib(char *name, unsigned long *parameters)
 /*
  * Libraries are given with the following format:
  * name:path:load_offset:load_size. eg.
- * Bitcoin:apps/btc.elf:0x1000:0x9fc0:0x20001800:0x1800
+ * Bitcoin:apps/btc.elf:0x1000:0x9fc0:0x20001800:0x1800 ...
  */
-static char *parse_app_infos(char *arg, char **filename, struct elf_info_s *elf)
+static char *parse_app_infos(char *arg, char **filename, struct elf_info_s *elf,
+                             bool *load_nvram, bool *save_nvram)
 {
   char *libname;
   int ret;
+  int load_nvram_i = 0;
+  int save_nvram_i = 0;
 
   libname = strdup(arg);
   *filename = strdup(arg);
@@ -619,17 +733,22 @@ static char *parse_app_infos(char *arg, char **filename, struct elf_info_s *elf)
     err(1, "strdup");
   }
 
-  ret = sscanf(
-      arg, "%[^:]:%[^:]:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx",
-      libname, *filename, &elf->load_offset, &elf->load_size, &elf->stack_addr,
-      &elf->stack_size, &elf->svc_call_addr, &elf->svc_cx_call_addr,
-      &elf->text_load_addr, &elf->fonts_addr, &elf->fonts_size);
-  if (ret != 11) {
+  ret = sscanf(arg,
+               "%[^:]:%[^:]:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%lx:0x%"
+               "lx:0x%lx:0x%lx:%d:%d",
+               libname, *filename, &elf->load_offset, &elf->load_size,
+               &elf->stack_addr, &elf->stack_size, &elf->svc_call_addr,
+               &elf->svc_cx_call_addr, &elf->text_load_addr, &elf->fonts_addr,
+               &elf->fonts_size, &elf->app_nvram_addr, &elf->app_nvram_size,
+               &load_nvram_i, &save_nvram_i);
+  if (ret != 15) {
     warnx("failed to parse app infos (\"%s\", %d)", arg, ret);
     free(libname);
     free(*filename);
     return NULL;
   }
+  *load_nvram = ((load_nvram_i == 1) ? true : false);
+  *save_nvram = ((save_nvram_i == 1) ? true : false);
 
   return libname;
 }
@@ -638,15 +757,18 @@ static int load_apps(int argc, char *argv[])
 {
   char *filename, *libname;
   struct elf_info_s elf;
+  bool load_nvram = false;
+  bool save_nvram = false;
   int i;
 
   for (i = 0; i < argc; i++) {
-    libname = parse_app_infos(argv[i], &filename, &elf);
+    libname =
+        parse_app_infos(argv[i], &filename, &elf, &load_nvram, &save_nvram);
     if (libname == NULL) {
       return -1;
     }
 
-    if (open_app(libname, filename, &elf) != 0) {
+    if (open_app(libname, filename, &elf, load_nvram, save_nvram) != 0) {
       return -1;
     }
   }

speculos-0.16.1.dev4/src/launcher.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <signal.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+struct app_s;
+
+void unload_running_app(bool unload_data);
+void *get_memory_code_address(void);
+struct app_s *get_current_app(void);
+char *get_app_nvram_file_name(void);
+bool get_app_save_nvram(void);
+unsigned long get_app_nvram_address(void);
+unsigned long get_app_nvram_size(void);
+unsigned long get_app_text_load_addr(void);
+void save_current_context(struct sigcontext *sigcontext);
+void replace_current_context(struct sigcontext *sigcontext);
+int replace_current_code(struct app_s *app);
+int run_lib(char *name, unsigned long *parameters);

{speculos-0.16.1.dev2 → speculos-0.16.1.dev4}/tests/c/syscalls/test_os_global_pin_is_validated.c

@@ -22,11 +22,41 @@
 hw_model_t hw_model = MODEL_COUNT;
 sdk_version_t sdk_version = SDK_COUNT;
 
+void *get_memory_code_address(void)
+{
+  return NULL;
+}
+
 struct app_s *get_current_app(void)
 {
   return NULL;
 }
 
+char *get_app_nvram_file_name(void)
+{
+  return NULL;
+}
+
+bool get_app_save_nvram(void)
+{
+  return false;
+}
+
+unsigned long get_app_nvram_address(void)
+{
+  return 0;
+}
+
+unsigned long get_app_nvram_size(void)
+{
+  return 0;
+}
+
+unsigned long get_app_text_load_addr(void)
+{
+  return 0;
+}
+
 void unload_running_app(bool UNUSED(unload_data))
 {
 }