← Watch feed
refactor(core): get rid of the STATIC macro
Public commit record
80/100 · Strong
What the developer wrote
Authored by Martin Milata
refactor(core): get rid of the STATIC macro
Relevant micropython changes:
decf8e6a8bb940d5829ca3296790631fcece7b21 all: Remove the "STATIC" macro and just use "static" instead.
[no changelog]
✓ Descriptive subject✓ Names a concrete action or component✓ Uses a recognizable type or scope✓ Provides detailed explanatory context
What changed, and why it matters
This commit is a large but purely mechanical code cleanup: it replaces the custom STATIC macro with the standard C keyword static across many MicroPython module files. There is no change to program logic, security boundaries, or behavior. It also removes build-system workarounds that were only needed because the old macro was being abused to expose internal functions.
Recommended action
No security action required. Treat as routine refactoring. Verify that the build still compiles and that upstream MicroPython's static-only convention is consistently applied.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The patch refactors Trezor’s MicroPython C modules to follow upstream MicroPython’s removal of the STATIC macro (micropython commit decf8e6a). Every change is a token substitution from STATIC to static, plus removal of build.rs defines that redefined STATIC to empty so that modtrezorutils-meminfo.h could call otherwise-internal functions. No function bodies, signatures, access-control semantics, or security-critical logic are altered. The standard C static keyword provides the same internal-linkage behavior the macro previously did.
Changed components
core/embed/projects/unix/main.ccore/embed/upymod/build.rscore/embed/upymod/modtrezorappcore/embed/upymod/modtrezorconfigcore/embed/upymod/modtrezorcryptocore/embed/upymod/modtrezoriocore/embed/upymod/modtrezoruicore/embed/upymod/modtrezorutilscore/embed/upymod/modutime.cInspect captured patch +789 / −797
diff --git a/core/embed/projects/unix/main.c b/core/embed/projects/unix/main.c
index 85dc2319..e31ba5b2 100644
--- a/core/embed/projects/unix/main.c
+++ b/core/embed/projects/unix/main.c
@@ -57,8 +57,8 @@
#include "py/stackctrl.h"
// Command line options, with their defaults
-STATIC bool compile_only = false;
-STATIC uint emit_opt = MP_EMIT_OPT_NONE;
+static bool compile_only = false;
+static uint emit_opt = MP_EMIT_OPT_NONE;
#if MICROPY_ENABLE_GC
// Heap size of GC heap (if enabled)
@@ -66,7 +66,7 @@ STATIC uint emit_opt = MP_EMIT_OPT_NONE;
long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
#endif
-STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
+static void stderr_print_strn(void *env, const char *str, size_t len) {
(void)env;
#ifdef USE_DBG_CONSOLE
dbg_console_write(str, len);
@@ -80,7 +80,7 @@ const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};
// If exc is SystemExit, return value where FORCED_EXIT bit set,
// and lower 8 bits are SystemExit value. For all other exceptions,
// return 1.
-STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
+static int handle_uncaught_exception(mp_obj_base_t *exc) {
// check for SystemExit
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type),
MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
@@ -106,7 +106,7 @@ STATIC int handle_uncaught_exception(mp_obj_base_t *exc) {
// Returns standard error codes: 0 for success, 1 for all other errors,
// except if FORCED_EXIT bit is set then script raised SystemExit and the
// value of the exit is in the lower 8 bits of the return value
-STATIC int execute_from_lexer(int source_kind, const void *source,
+static int execute_from_lexer(int source_kind, const void *source,
mp_parse_input_kind_t input_kind, bool is_repl) {
mp_hal_set_interrupt_char(CHAR_CTRL_C);
@@ -165,7 +165,7 @@ STATIC int execute_from_lexer(int source_kind, const void *source,
#if MICROPY_USE_READLINE == 1
#include "shared/readline/readline.h"
#else
-STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
+static char *strjoin(const char *s1, int sep_char, const char *s2) {
int l1 = strlen(s1);
int l2 = strlen(s2);
char *s = malloc(l1 + l2 + 2);
@@ -180,7 +180,7 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
}
#endif
-STATIC int do_repl(void) {
+static int do_repl(void) {
mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
"; " MICROPY_PY_SYS_PLATFORM
" version\nUse Ctrl-D to exit, Ctrl-E for paste mode\n");
@@ -296,15 +296,15 @@ STATIC int do_repl(void) {
#endif
}
-STATIC int do_file(const char *file) {
+static int do_file(const char *file) {
return execute_from_lexer(LEX_SRC_FILENAME, file, MP_PARSE_FILE_INPUT, false);
}
-STATIC int do_str(const char *str) {
+static int do_str(const char *str) {
return execute_from_lexer(LEX_SRC_STR, str, MP_PARSE_FILE_INPUT, false);
}
-STATIC int usage(char **argv) {
+static int usage(char **argv) {
printf(
"usage: %s [<opts>] [-X <implopt>] [-c <command>] [<filename>]\n"
"Options:\n"
@@ -339,7 +339,7 @@ STATIC int usage(char **argv) {
}
// Process options which set interpreter init options
-STATIC void pre_process_options(int argc, char **argv) {
+static void pre_process_options(int argc, char **argv) {
for (int a = 1; a < argc; a++) {
if (argv[a][0] == '-') {
if (strcmp(argv[a], "-X") == 0) {
@@ -403,7 +403,7 @@ STATIC void pre_process_options(int argc, char **argv) {
}
}
-STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
+static void set_sys_argv(char *argv[], int argc, int start_arg) {
for (int i = start_arg; i < argc; i++) {
mp_obj_list_append(mp_sys_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
}
@@ -725,7 +725,7 @@ mp_import_stat_t mp_import_stat(const char *path) {
mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args,
mp_map_t *kwargs) {
enum { ARG_file, ARG_mode };
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE}},
{MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)}},
{MP_QSTR_buffering, MP_ARG_INT, {.u_int = -1}},
diff --git a/core/embed/upymod/build.rs b/core/embed/upymod/build.rs
index 08892b69..0e1c6be6 100644
--- a/core/embed/upymod/build.rs
+++ b/core/embed/upymod/build.rs
@@ -85,9 +85,7 @@ fn main() -> Result<()> {
lib.add_private_define("MICROPY_OOM_CALLBACK", Some("0"));
} else {
lib.add_define("PYOPT", Some("0"));
- // This is needed to compile modtrezorutils-meminfo.h that
- // calls STATIC functions in other modules
- lib.add_private_defines([("STATIC", Some("")), ("MICROPY_OOM_CALLBACK", Some("1"))]);
+ lib.add_private_define("MICROPY_OOM_CALLBACK", Some("1"));
}
// TODO: remove this hack (causing cyclic dependence) by moving micropython
@@ -242,12 +240,6 @@ fn main() -> Result<()> {
lib.add_define("TREZOR_EMULATOR_FROZEN", None);
}
- // TODO: refactor modtrezorutils-meminfo.h to avoid this
- //
- // The hack is needed to compile modtrezorutils-meminfo.h that
- // calls STATIC functions in other modules
- lib.add_private_define("STATIC", Some(""));
-
lib.add_sources_in_dir(
mpy_dir,
[
diff --git a/core/embed/upymod/modtrezorapp/modtrezorapp-image.h b/core/embed/upymod/modtrezorapp/modtrezorapp-image.h
index 5ab97c6e..3597246e 100644
--- a/core/embed/upymod/modtrezorapp/modtrezorapp-image.h
+++ b/core/embed/upymod/modtrezorapp/modtrezorapp-image.h
@@ -36,7 +36,7 @@ typedef struct _mp_obj_AppImage_t {
/// """
/// Writes data to the application image at the specified offset.
/// """
-STATIC mp_obj_t mod_trezorapp_AppImage_write(mp_obj_t self, mp_obj_t offset_obj,
+static mp_obj_t mod_trezorapp_AppImage_write(mp_obj_t self, mp_obj_t offset_obj,
mp_obj_t data_obj) {
mp_obj_AppImage_t *o = MP_OBJ_TO_PTR(self);
app_cache_handle_t image = o->image;
@@ -54,7 +54,7 @@ STATIC mp_obj_t mod_trezorapp_AppImage_write(mp_obj_t self, mp_obj_t offset_obj,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorapp_AppImage_write_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorapp_AppImage_write_obj,
mod_trezorapp_AppImage_write);
/// def finalize(self, bool accept) -> None:
@@ -63,7 +63,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorapp_AppImage_write_obj,
/// the image is marked as loaded and will be available for execution.
/// If `accept` is false, the image is discarded.
/// """
-STATIC mp_obj_t mod_trezorapp_AppImage_finalize(mp_obj_t self,
+static mp_obj_t mod_trezorapp_AppImage_finalize(mp_obj_t self,
mp_obj_t accept_obj) {
mp_obj_AppImage_t *o = MP_OBJ_TO_PTR(self);
@@ -82,15 +82,15 @@ STATIC mp_obj_t mod_trezorapp_AppImage_finalize(mp_obj_t self,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_AppImage_finalize_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_AppImage_finalize_obj,
mod_trezorapp_AppImage_finalize);
-STATIC const mp_rom_map_elem_t mod_trezorapp_AppImage_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorapp_AppImage_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mod_trezorapp_AppImage_write_obj)},
{MP_ROM_QSTR(MP_QSTR_finalize),
MP_ROM_PTR(&mod_trezorapp_AppImage_finalize_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorapp_AppImage_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorapp_AppImage_locals_dict,
mod_trezorapp_AppImage_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorapp/modtrezorapp-task.h b/core/embed/upymod/modtrezorapp/modtrezorapp-task.h
index b3a77cbe..fe045189 100644
--- a/core/embed/upymod/modtrezorapp/modtrezorapp-task.h
+++ b/core/embed/upymod/modtrezorapp/modtrezorapp-task.h
@@ -36,18 +36,18 @@ typedef struct _mp_obj_AppTask_t {
/// """
/// Returns the task id.
/// """
-STATIC mp_obj_t mod_trezorapp_AppTask_id(mp_obj_t self) {
+static mp_obj_t mod_trezorapp_AppTask_id(mp_obj_t self) {
mp_obj_AppTask_t *o = MP_OBJ_TO_PTR(self);
return MP_OBJ_NEW_SMALL_INT(o->task_id);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_id_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_id_obj,
mod_trezorapp_AppTask_id);
/// def is_running(self) -> bool:
/// """
/// Returns whether the application is still running.
/// """
-STATIC mp_obj_t mod_trezorapp_AppTask_is_running(mp_obj_t self) {
+static mp_obj_t mod_trezorapp_AppTask_is_running(mp_obj_t self) {
mp_obj_AppTask_t *o = MP_OBJ_TO_PTR(self);
if (app_task_is_running(o->task_id)) {
@@ -56,14 +56,14 @@ STATIC mp_obj_t mod_trezorapp_AppTask_is_running(mp_obj_t self) {
return mp_const_false;
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_is_running_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_is_running_obj,
mod_trezorapp_AppTask_is_running);
/// def unload(self) -> None:
/// """
/// Unloads the application associated with this task.
/// """
-STATIC mp_obj_t mod_trezorapp_AppTask_unload(mp_obj_t self) {
+static mp_obj_t mod_trezorapp_AppTask_unload(mp_obj_t self) {
mp_obj_AppTask_t *o = MP_OBJ_TO_PTR(self);
app_task_unload(o->task_id);
@@ -71,17 +71,17 @@ STATIC mp_obj_t mod_trezorapp_AppTask_unload(mp_obj_t self) {
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_unload_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_AppTask_unload_obj,
mod_trezorapp_AppTask_unload);
-STATIC const mp_rom_map_elem_t mod_trezorapp_AppTask_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorapp_AppTask_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&mod_trezorapp_AppTask_id_obj)},
{MP_ROM_QSTR(MP_QSTR_is_running),
MP_ROM_PTR(&mod_trezorapp_AppTask_is_running_obj)},
{MP_ROM_QSTR(MP_QSTR_unload),
MP_ROM_PTR(&mod_trezorapp_AppTask_unload_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorapp_AppTask_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorapp_AppTask_locals_dict,
mod_trezorapp_AppTask_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorapp/modtrezorapp.c b/core/embed/upymod/modtrezorapp/modtrezorapp.c
index 15b04461..01107425 100644
--- a/core/embed/upymod/modtrezorapp/modtrezorapp.c
+++ b/core/embed/upymod/modtrezorapp/modtrezorapp.c
@@ -41,7 +41,7 @@
/// """
/// Spawns an application task from the app cache.
/// """
-STATIC mp_obj_t mod_trezorapp_spawn_task(mp_obj_t app_hash_obj) {
+static mp_obj_t mod_trezorapp_spawn_task(mp_obj_t app_hash_obj) {
mp_buffer_info_t hash = {0};
mp_get_buffer_raise(app_hash_obj, &hash, MP_BUFFER_READ);
@@ -63,14 +63,14 @@ STATIC mp_obj_t mod_trezorapp_spawn_task(mp_obj_t app_hash_obj) {
o->task_id = task_id;
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_spawn_task_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorapp_spawn_task_obj,
mod_trezorapp_spawn_task);
/// def create_image(app_hash: bytes, size: int) -> AppImage:
/// """
/// Creates a new application image in the app cache.
/// """
-STATIC mp_obj_t mod_trezorapp_create_image(mp_obj_t app_hash_obj,
+static mp_obj_t mod_trezorapp_create_image(mp_obj_t app_hash_obj,
mp_obj_t size_obj) {
mp_buffer_info_t hash = {0};
mp_get_buffer_raise(app_hash_obj, &hash, MP_BUFFER_READ);
@@ -94,7 +94,7 @@ STATIC mp_obj_t mod_trezorapp_create_image(mp_obj_t app_hash_obj,
o->image = image;
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_create_image_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_create_image_obj,
mod_trezorapp_create_image);
#ifdef TREZOR_EMULATOR
@@ -102,7 +102,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_create_image_obj,
/// """
/// Loads an application image from a file into the app cache.
/// """
-STATIC mp_obj_t mod_trezorapp_load_file(mp_obj_t app_hash_obj,
+static mp_obj_t mod_trezorapp_load_file(mp_obj_t app_hash_obj,
mp_obj_t filename_obj) {
mp_buffer_info_t hash = {0};
mp_get_buffer_raise(app_hash_obj, &hash, MP_BUFFER_READ);
@@ -123,11 +123,11 @@ STATIC mp_obj_t mod_trezorapp_load_file(mp_obj_t app_hash_obj,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_load_file_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorapp_load_file_obj,
mod_trezorapp_load_file);
#endif // TREZOR_EMULATOR
-STATIC const mp_rom_map_elem_t mp_module_trezorapp_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_trezorapp_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_trezorapp)},
{MP_ROM_QSTR(MP_QSTR_spawn_task),
@@ -139,7 +139,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorapp_globals_table[] = {
#endif
};
-STATIC MP_DEFINE_CONST_DICT(mp_module_trezorapp_globals,
+static MP_DEFINE_CONST_DICT(mp_module_trezorapp_globals,
mp_module_trezorapp_globals_table);
const mp_obj_module_t mp_module_trezorapp = {
diff --git a/core/embed/upymod/modtrezorconfig/modtrezorconfig.c b/core/embed/upymod/modtrezorconfig/modtrezorconfig.c
index 39390778..678450bc 100644
--- a/core/embed/upymod/modtrezorconfig/modtrezorconfig.c
+++ b/core/embed/upymod/modtrezorconfig/modtrezorconfig.c
@@ -55,7 +55,7 @@ static secbool wrapped_ui_wait_callback(uint32_t wait, uint32_t progress,
/// Locks the storage if it is currently unlocked, and allows setting
/// a new UI callback.
/// """
-STATIC mp_obj_t mod_trezorconfig_init(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorconfig_init(size_t n_args, const mp_obj_t *args) {
if (n_args > 0) {
MP_STATE_VM(trezorconfig_ui_wait_callback) = args[0];
storage_setup(wrapped_ui_wait_callback);
@@ -64,7 +64,7 @@ STATIC mp_obj_t mod_trezorconfig_init(size_t n_args, const mp_obj_t *args) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_init_obj, 0, 1,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_init_obj, 0, 1,
mod_trezorconfig_init);
/// def unlock(pin: str, ext_salt: AnyBytes | None) -> bool:
@@ -72,7 +72,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_init_obj, 0, 1,
/// Attempts to unlock the storage with the given PIN and external salt.
/// Returns True on success, False on failure.
/// """
-STATIC mp_obj_t mod_trezorconfig_unlock(mp_obj_t pin, mp_obj_t ext_salt) {
+static mp_obj_t mod_trezorconfig_unlock(mp_obj_t pin, mp_obj_t ext_salt) {
mp_buffer_info_t pin_b = {0};
mp_get_buffer_raise(pin, &pin_b, MP_BUFFER_READ);
@@ -137,7 +137,7 @@ STATIC mp_obj_t mod_trezorconfig_unlock(mp_obj_t pin, mp_obj_t ext_salt) {
MP_ERROR_TEXT("Something went wrong during unlock."));
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorconfig_unlock_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorconfig_unlock_obj,
mod_trezorconfig_unlock);
/// def check_pin(pin: str, ext_salt: AnyBytes | None) -> bool:
@@ -145,57 +145,57 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorconfig_unlock_obj,
/// Check the given PIN with the given external salt.
/// Returns True on success, False on failure.
/// """
-STATIC mp_obj_t mod_trezorconfig_check_pin(mp_obj_t pin, mp_obj_t ext_salt) {
+static mp_obj_t mod_trezorconfig_check_pin(mp_obj_t pin, mp_obj_t ext_salt) {
return mod_trezorconfig_unlock(pin, ext_salt);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorconfig_check_pin_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorconfig_check_pin_obj,
mod_trezorconfig_check_pin);
/// def lock() -> None:
/// """
/// Locks the storage.
/// """
-STATIC mp_obj_t mod_trezorconfig_lock(void) {
+static mp_obj_t mod_trezorconfig_lock(void) {
storage_lock();
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_lock_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_lock_obj,
mod_trezorconfig_lock);
/// def is_unlocked() -> bool:
/// """
/// Returns True if storage is unlocked, False otherwise.
/// """
-STATIC mp_obj_t mod_trezorconfig_is_unlocked(void) {
+static mp_obj_t mod_trezorconfig_is_unlocked(void) {
if (sectrue != storage_is_unlocked()) {
return mp_const_false;
}
return mp_const_true;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_is_unlocked_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_is_unlocked_obj,
mod_trezorconfig_is_unlocked);
/// def has_pin() -> bool:
/// """
/// Returns True if storage has a configured PIN, False otherwise.
/// """
-STATIC mp_obj_t mod_trezorconfig_has_pin(void) {
+static mp_obj_t mod_trezorconfig_has_pin(void) {
if (sectrue != storage_has_pin()) {
return mp_const_false;
}
return mp_const_true;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_has_pin_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_has_pin_obj,
mod_trezorconfig_has_pin);
/// def get_pin_rem() -> int:
/// """
/// Returns the number of remaining PIN entry attempts.
/// """
-STATIC mp_obj_t mod_trezorconfig_get_pin_rem(void) {
+static mp_obj_t mod_trezorconfig_get_pin_rem(void) {
return mp_obj_new_int_from_uint(storage_get_pin_rem());
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_get_pin_rem_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_get_pin_rem_obj,
mod_trezorconfig_get_pin_rem);
/// def change_pin(
@@ -206,7 +206,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_get_pin_rem_obj,
/// Change PIN and external salt. Returns True on success, False on entering
/// the wipe code. Has to be run with unlocked storage.
/// """
-STATIC mp_obj_t mod_trezorconfig_change_pin(size_t n_args,
+static mp_obj_t mod_trezorconfig_change_pin(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t newpin = {0};
mp_get_buffer_raise(args[0], &newpin, MP_BUFFER_READ);
@@ -245,33 +245,33 @@ STATIC mp_obj_t mod_trezorconfig_change_pin(size_t n_args,
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Change PIN failed."));
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_change_pin_obj, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_change_pin_obj, 2,
2, mod_trezorconfig_change_pin);
/// def ensure_not_wipe_code(pin: str) -> None:
/// """
/// Wipes the device if the entered PIN is the wipe code.
/// """
-STATIC mp_obj_t mod_trezorconfig_ensure_not_wipe_code(mp_obj_t pin) {
+static mp_obj_t mod_trezorconfig_ensure_not_wipe_code(mp_obj_t pin) {
mp_buffer_info_t pin_b = {0};
mp_get_buffer_raise(pin, &pin_b, MP_BUFFER_READ);
storage_ensure_not_wipe_code(pin_b.buf, pin_b.len);
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorconfig_ensure_not_wipe_code_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorconfig_ensure_not_wipe_code_obj,
mod_trezorconfig_ensure_not_wipe_code);
/// def has_wipe_code() -> bool:
/// """
/// Returns True if storage has a configured wipe code, False otherwise.
/// """
-STATIC mp_obj_t mod_trezorconfig_has_wipe_code(void) {
+static mp_obj_t mod_trezorconfig_has_wipe_code(void) {
if (sectrue != storage_has_wipe_code()) {
return mp_const_false;
}
return mp_const_true;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_has_wipe_code_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_has_wipe_code_obj,
mod_trezorconfig_has_wipe_code);
/// def change_wipe_code(
@@ -282,7 +282,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_has_wipe_code_obj,
/// """
/// Change wipe code. Returns True on success, False on failure.
/// """
-STATIC mp_obj_t mod_trezorconfig_change_wipe_code(size_t n_args,
+static mp_obj_t mod_trezorconfig_change_wipe_code(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t pin_b = {0};
mp_get_buffer_raise(args[0], &pin_b, MP_BUFFER_READ);
@@ -306,7 +306,7 @@ STATIC mp_obj_t mod_trezorconfig_change_wipe_code(size_t n_args,
}
return mp_const_true;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorconfig_change_wipe_code_obj, 3, 3,
mod_trezorconfig_change_wipe_code);
@@ -316,7 +316,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// Raises a RuntimeError if decryption or authentication of the stored
/// value fails.
/// """
-STATIC mp_obj_t mod_trezorconfig_get(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorconfig_get(size_t n_args, const mp_obj_t *args) {
uint8_t app = trezor_obj_get_uint8(args[0]);
if (app == 0 || app > MAX_APPID) {
mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid app ID."));
@@ -342,14 +342,14 @@ STATIC mp_obj_t mod_trezorconfig_get(size_t n_args, const mp_obj_t *args) {
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_get_obj, 2, 3,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_get_obj, 2, 3,
mod_trezorconfig_get);
/// def set(app: int, key: int, value: AnyBytes, public: bool = False) -> None:
/// """
/// Sets a value of given key for given app.
/// """
-STATIC mp_obj_t mod_trezorconfig_set(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorconfig_set(size_t n_args, const mp_obj_t *args) {
uint8_t app = trezor_obj_get_uint8(args[0]);
if (app == 0 || app > MAX_APPID) {
mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid app ID."));
@@ -367,7 +367,7 @@ STATIC mp_obj_t mod_trezorconfig_set(size_t n_args, const mp_obj_t *args) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_obj, 3, 4,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_obj, 3, 4,
mod_trezorconfig_set);
/// def delete(
@@ -376,7 +376,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_obj, 3, 4,
/// """
/// Deletes the given key of the given app.
/// """
-STATIC mp_obj_t mod_trezorconfig_delete(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorconfig_delete(size_t n_args, const mp_obj_t *args) {
uint8_t app = trezor_obj_get_uint8(args[0]);
if (app == 0 || app > MAX_APPID) {
mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid app ID."));
@@ -398,7 +398,7 @@ STATIC mp_obj_t mod_trezorconfig_delete(size_t n_args, const mp_obj_t *args) {
}
return mp_const_true;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_delete_obj, 2, 4,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_delete_obj, 2, 4,
mod_trezorconfig_delete);
/// def set_counter(
@@ -407,7 +407,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_delete_obj, 2, 4,
/// """
/// Sets the given key of the given app as a counter with the given value.
/// """
-STATIC mp_obj_t mod_trezorconfig_set_counter(size_t n_args,
+static mp_obj_t mod_trezorconfig_set_counter(size_t n_args,
const mp_obj_t *args) {
uint8_t app = trezor_obj_get_uint8(args[0]);
if (app == 0 || app > MAX_APPID) {
@@ -427,7 +427,7 @@ STATIC mp_obj_t mod_trezorconfig_set_counter(size_t n_args,
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_counter_obj, 3,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_counter_obj, 3,
4, mod_trezorconfig_set_counter);
/// def next_counter(
@@ -437,7 +437,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_set_counter_obj, 3,
/// Increments the counter stored under the given key of the given app and
/// returns the new value.
/// """
-STATIC mp_obj_t mod_trezorconfig_next_counter(size_t n_args,
+static mp_obj_t mod_trezorconfig_next_counter(size_t n_args,
const mp_obj_t *args) {
uint8_t app = trezor_obj_get_uint8(args[0]);
if (app == 0 || app > MAX_APPID) {
@@ -457,18 +457,18 @@ STATIC mp_obj_t mod_trezorconfig_next_counter(size_t n_args,
}
return mp_obj_new_int_from_uint(count);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_next_counter_obj, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorconfig_next_counter_obj, 2,
3, mod_trezorconfig_next_counter);
/// def wipe() -> None:
/// """
/// Erases the whole config. Use with caution!
/// """
-STATIC mp_obj_t mod_trezorconfig_wipe(void) {
+static mp_obj_t mod_trezorconfig_wipe(void) {
storage_wipe();
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_wipe_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_wipe_obj,
mod_trezorconfig_wipe);
/// from enum import IntEnum
@@ -478,15 +478,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorconfig_wipe_obj,
/// PROCESSING_MSG = 2
/// STARTING_MSG = 3
/// WRONG_PIN_MSG = 4
-STATIC const qstr mod_trezorconfig_StorageMessage_fields[] = {
+static const qstr mod_trezorconfig_StorageMessage_fields[] = {
MP_QSTR_NO_MSG, MP_QSTR_VERIFYING_PIN_MSG, MP_QSTR_PROCESSING_MSG,
MP_QSTR_STARTING_MSG, MP_QSTR_WRONG_PIN_MSG};
-STATIC MP_DEFINE_ATTRTUPLE(
+static MP_DEFINE_ATTRTUPLE(
mod_trezorconfig_StorageMessage_obj, mod_trezorconfig_StorageMessage_fields,
(sizeof(mod_trezorconfig_StorageMessage_fields) / sizeof(qstr)),
MP_ROM_INT(0), MP_ROM_INT(1), MP_ROM_INT(2), MP_ROM_INT(3), MP_ROM_INT(4));
-STATIC const mp_rom_map_elem_t mp_module_trezorconfig_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_trezorconfig_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_trezorconfig)},
{MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&mod_trezorconfig_init_obj)},
{MP_ROM_QSTR(MP_QSTR_check_pin),
@@ -517,7 +517,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorconfig_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_StorageMessage),
MP_ROM_PTR(&mod_trezorconfig_StorageMessage_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mp_module_trezorconfig_globals,
+static MP_DEFINE_CONST_DICT(mp_module_trezorconfig_globals,
mp_module_trezorconfig_globals_table);
const mp_obj_module_t mp_module_trezorconfig = {
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aes.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aes.h
index 425dfa3d..58a19b81 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aes.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aes.h
@@ -58,7 +58,7 @@ typedef struct _mp_obj_AES_t {
/// """
/// Initialize AES context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AES_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_AES_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 2, 3, false);
@@ -164,33 +164,33 @@ static mp_obj_t aes_update(mp_obj_t self, mp_obj_t data, bool encrypt) {
/// """
/// Encrypt data and update AES context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AES_encrypt(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_AES_encrypt(mp_obj_t self, mp_obj_t data) {
return aes_update(self, data, true);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AES_encrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AES_encrypt_obj,
mod_trezorcrypto_AES_encrypt);
/// def decrypt(self, data: AnyBytes) -> bytes:
/// """
/// Decrypt data and update AES context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AES_decrypt(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_AES_decrypt(mp_obj_t self, mp_obj_t data) {
return aes_update(self, data, false);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AES_decrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AES_decrypt_obj,
mod_trezorcrypto_AES_decrypt);
-STATIC mp_obj_t mod_trezorcrypto_AES___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_AES___del__(mp_obj_t self) {
mp_obj_AES_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->encrypt_ctx), sizeof(aes_encrypt_ctx));
memzero(&(o->decrypt_ctx), sizeof(aes_decrypt_ctx));
memzero(o->iv, AES_BLOCK_SIZE);
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AES___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AES___del___obj,
mod_trezorcrypto_AES___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_AES_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_AES_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_encrypt),
MP_ROM_PTR(&mod_trezorcrypto_AES_encrypt_obj)},
{MP_ROM_QSTR(MP_QSTR_decrypt),
@@ -203,7 +203,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_AES_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_OFB), MP_ROM_INT(OFB)},
{MP_ROM_QSTR(MP_QSTR_CTR), MP_ROM_INT(CTR)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_AES_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_AES_locals_dict,
mod_trezorcrypto_AES_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aesgcm.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aesgcm.h
index 4d4e62fe..c6fc685a 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aesgcm.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-aesgcm.h
@@ -46,7 +46,7 @@ typedef struct _mp_obj_AesGcm_t {
/// """
/// Initialize the AES-GCM context for encryption.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_AesGcm_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 2, 2, false);
@@ -74,7 +74,7 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_make_new(const mp_obj_type_t *type,
/// be called repeatedly to add authenticated data at any point before
/// finish().
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_auth(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_AesGcm_auth(mp_obj_t self, mp_obj_t data) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Invalid state."));
@@ -87,14 +87,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_auth(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_auth_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_auth_obj,
mod_trezorcrypto_AesGcm_auth);
/// def reset(self, iv: AnyBytes) -> None:
/// """
/// Reset the IV for encryption.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_reset(mp_obj_t self, mp_obj_t iv) {
+static mp_obj_t mod_trezorcrypto_AesGcm_reset(mp_obj_t self, mp_obj_t iv) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t in = {0};
mp_get_buffer_raise(iv, &in, MP_BUFFER_READ);
@@ -105,14 +105,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_reset(mp_obj_t self, mp_obj_t iv) {
o->state = STATE_INIT;
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_reset_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_reset_obj,
mod_trezorcrypto_AesGcm_reset);
/// def encrypt(self, data: AnyBytes) -> bytes:
/// """
/// Encrypt data chunk.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_AesGcm_encrypt(mp_obj_t self, mp_obj_t data) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Invalid state."));
@@ -130,14 +130,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt(mp_obj_t self, mp_obj_t data) {
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_encrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_encrypt_obj,
mod_trezorcrypto_AesGcm_encrypt);
/// def encrypt_in_place(self, data: AnyBuffer) -> int:
/// """
/// Encrypt data chunk in place. Returns the length of the encrypted data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt_in_place(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_AesGcm_encrypt_in_place(mp_obj_t self,
mp_obj_t data) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
@@ -152,14 +152,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt_in_place(mp_obj_t self,
}
return mp_obj_new_int(in.len);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_encrypt_in_place_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_encrypt_in_place_obj,
mod_trezorcrypto_AesGcm_encrypt_in_place);
/// def finish(self) -> bytes:
/// """
/// Compute the GCM authentication tag.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt_finish(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_AesGcm_encrypt_finish(mp_obj_t self) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Invalid state."));
@@ -175,7 +175,7 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_encrypt_finish(mp_obj_t self) {
}
return mp_obj_new_bytes_from_vstr(&tag);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AesGcm_encrypt_finish_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AesGcm_encrypt_finish_obj,
mod_trezorcrypto_AesGcm_encrypt_finish);
/// class aesgcm_decrypt:
@@ -204,7 +204,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AesGcm_encrypt_finish_obj,
/// """
/// Decrypt data chunk.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_AesGcm_decrypt(mp_obj_t self, mp_obj_t data) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Invalid state."));
@@ -222,14 +222,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt(mp_obj_t self, mp_obj_t data) {
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_obj,
mod_trezorcrypto_AesGcm_decrypt);
/// def decrypt_in_place(self, data: AnyBuffer) -> int:
/// """
/// Decrypt data chunk in place. Returns the length of the decrypted data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt_in_place(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_AesGcm_decrypt_in_place(mp_obj_t self,
mp_obj_t data) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
@@ -244,14 +244,14 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt_in_place(mp_obj_t self,
}
return mp_obj_new_int(in.len);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_in_place_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_in_place_obj,
mod_trezorcrypto_AesGcm_decrypt_in_place);
/// def finish(self, expected_tag: AnyBytes) -> None:
/// """
/// Verify the GCM authentication tag.
/// """
-STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt_finish(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_AesGcm_decrypt_finish(mp_obj_t self,
mp_obj_t expected_tag) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
if (o->state != STATE_INIT && o->state != STATE_PROCESSING) {
@@ -280,18 +280,18 @@ STATIC mp_obj_t mod_trezorcrypto_AesGcm_decrypt_finish(mp_obj_t self,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_finish_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_AesGcm_decrypt_finish_obj,
mod_trezorcrypto_AesGcm_decrypt_finish);
-STATIC mp_obj_t mod_trezorcrypto_AesGcm___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_AesGcm___del__(mp_obj_t self) {
mp_obj_AesGcm_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(gcm_ctx));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AesGcm___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_AesGcm___del___obj,
mod_trezorcrypto_AesGcm___del__);
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_AesGcmEncrypt_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_auth),
MP_ROM_PTR(&mod_trezorcrypto_AesGcm_auth_obj)},
@@ -307,10 +307,10 @@ STATIC const mp_rom_map_elem_t
MP_ROM_PTR(&mod_trezorcrypto_AesGcm___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_AesGcmEncrypt_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_AesGcmEncrypt_locals_dict,
mod_trezorcrypto_AesGcmEncrypt_locals_dict_table);
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_AesGcmDecrypt_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_auth),
MP_ROM_PTR(&mod_trezorcrypto_AesGcm_auth_obj)},
@@ -326,7 +326,7 @@ STATIC const mp_rom_map_elem_t
MP_ROM_PTR(&mod_trezorcrypto_AesGcm___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_AesGcmDecrypt_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_AesGcmDecrypt_locals_dict,
mod_trezorcrypto_AesGcmDecrypt_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bech32.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bech32.h
index ab4d569d..80751e83 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bech32.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bech32.h
@@ -31,7 +31,7 @@
/// """
/// Decode a Bech32 or Bech32m string
/// """
-STATIC mp_obj_t mod_trezorcrypto_bech32_decode(size_t n_args,
+static mp_obj_t mod_trezorcrypto_bech32_decode(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t bech = {0};
mp_get_buffer_raise(args[0], &bech, MP_BUFFER_READ);
@@ -69,20 +69,20 @@ STATIC mp_obj_t mod_trezorcrypto_bech32_decode(size_t n_args,
return MP_OBJ_FROM_PTR(tuple);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bech32_decode_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bech32_decode_obj,
1, 2,
mod_trezorcrypto_bech32_decode);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_bech32_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_bech32_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bech32)},
{MP_ROM_QSTR(MP_QSTR_decode),
MP_ROM_PTR(&mod_trezorcrypto_bech32_decode_obj)},
{MP_ROM_QSTR(MP_QSTR_BECH32), MP_ROM_INT(BECH32_ENCODING_BECH32)},
{MP_ROM_QSTR(MP_QSTR_BECH32M), MP_ROM_INT(BECH32_ENCODING_BECH32M)}};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_bech32_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_bech32_globals,
mod_trezorcrypto_bech32_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_bech32_module = {
+static const mp_obj_module_t mod_trezorcrypto_bech32_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_bech32_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip32.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip32.h
index e480ab27..d5ec43f0 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip32.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip32.h
@@ -49,10 +49,10 @@
/// ) -> None:
/// """
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_HDNode_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_depth,
MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ,
{.u_obj = mp_const_none}},
@@ -145,7 +145,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_make_new(const mp_obj_type_t *type,
/// """
/// Derive a BIP0032 child node in place.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_derive(size_t n_args,
+static mp_obj_t mod_trezorcrypto_HDNode_derive(size_t n_args,
const mp_obj_t *args) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(args[0]);
uint32_t i = trezor_obj_get_uint(args[1]);
@@ -176,7 +176,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_derive(size_t n_args,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_HDNode_derive_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_HDNode_derive_obj,
2, 3,
mod_trezorcrypto_HDNode_derive);
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_HDNode_derive_obj,
/// Go through a list of indexes and iteratively derive a child node in
/// place.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_derive_path(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_HDNode_derive_path(mp_obj_t self,
mp_obj_t path) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
@@ -212,14 +212,14 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_derive_path(mp_obj_t self,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_derive_path_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_derive_path_obj,
mod_trezorcrypto_HDNode_derive_path);
/// def serialize_public(self, version: int) -> str:
/// """
/// Serialize the public info from HD node to base58 string.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_public(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_HDNode_serialize_public(mp_obj_t self,
mp_obj_t version) {
uint32_t ver = trezor_obj_get_uint(version);
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
@@ -239,14 +239,14 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_public(mp_obj_t self,
xpub.len = written - 1;
return mp_obj_new_str_from_vstr(&xpub);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_public_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_public_obj,
mod_trezorcrypto_HDNode_serialize_public);
/// def clone(self) -> HDNode:
/// """
/// Returns a copy of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_clone(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_clone(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
mp_obj_HDNode_t *copy = mp_obj_malloc_with_finaliser(
mp_obj_HDNode_t, &mod_trezorcrypto_HDNode_type);
@@ -254,95 +254,95 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_clone(mp_obj_t self) {
copy->fingerprint = o->fingerprint;
return MP_OBJ_FROM_PTR(copy);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_clone_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_clone_obj,
mod_trezorcrypto_HDNode_clone);
/// def depth(self) -> int:
/// """
/// Returns a depth of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_depth(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_depth(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_int_from_uint(o->hdnode.depth);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_depth_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_depth_obj,
mod_trezorcrypto_HDNode_depth);
/// def fingerprint(self) -> int:
/// """
/// Returns a fingerprint of the HD node (hash of the parent public key).
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_fingerprint(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_fingerprint(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_int_from_uint(o->fingerprint);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_fingerprint_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_fingerprint_obj,
mod_trezorcrypto_HDNode_fingerprint);
/// def child_num(self) -> int:
/// """
/// Returns a child index of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_child_num(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_child_num(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_int_from_uint(o->hdnode.child_num);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_child_num_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_child_num_obj,
mod_trezorcrypto_HDNode_child_num);
/// def chain_code(self) -> bytes:
/// """
/// Returns a chain code of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_chain_code(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_chain_code(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_bytes(o->hdnode.chain_code, sizeof(o->hdnode.chain_code));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_chain_code_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_chain_code_obj,
mod_trezorcrypto_HDNode_chain_code);
/// def private_key(self) -> bytes:
/// """
/// Returns a private key of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_private_key(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_private_key(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_bytes(o->hdnode.private_key, sizeof(o->hdnode.private_key));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_private_key_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_private_key_obj,
mod_trezorcrypto_HDNode_private_key);
/// def private_key_ext(self) -> bytes:
/// """
/// Returns a private key extension of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_private_key_ext(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_private_key_ext(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_bytes(o->hdnode.private_key_extension,
sizeof(o->hdnode.private_key_extension));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_private_key_ext_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_private_key_ext_obj,
mod_trezorcrypto_HDNode_private_key_ext);
/// def public_key(self) -> bytes:
/// """
/// Returns a public key of the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_public_key(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_public_key(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
if (hdnode_fill_public_key(&o->hdnode) != 0) {
mp_raise_ValueError(MP_ERROR_TEXT("Invalid private key"));
}
return mp_obj_new_bytes(o->hdnode.public_key, sizeof(o->hdnode.public_key));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_public_key_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_public_key_obj,
mod_trezorcrypto_HDNode_public_key);
/// def address(self, version: int) -> str:
/// """
/// Compute a base58-encoded address string from the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_address(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_HDNode_address(mp_obj_t self,
mp_obj_t version) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
@@ -356,7 +356,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_address(mp_obj_t self,
address.len = strlen(address.buf);
return mp_obj_new_str_from_vstr(&address);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_address_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_address_obj,
mod_trezorcrypto_HDNode_address);
#if !BITCOIN_ONLY
@@ -366,7 +366,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_address_obj,
/// """
/// Compute a NEM address string from the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_nem_address(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_HDNode_nem_address(mp_obj_t self,
mp_obj_t network) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
@@ -381,7 +381,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_nem_address(mp_obj_t self,
address.len = strlen(address.buf);
return mp_obj_new_str_from_vstr(&address);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_nem_address_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_nem_address_obj,
mod_trezorcrypto_HDNode_nem_address);
/// def nem_encrypt(
@@ -394,7 +394,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_nem_address_obj,
/// """
/// Encrypts payload using the transfer's public key
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_nem_encrypt(size_t n_args,
+static mp_obj_t mod_trezorcrypto_HDNode_nem_encrypt(size_t n_args,
const mp_obj_t *args) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(args[0]);
@@ -430,7 +430,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_nem_encrypt(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_HDNode_nem_encrypt_obj, 5, 5,
mod_trezorcrypto_HDNode_nem_encrypt);
@@ -440,7 +440,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Compute an Ethereum pubkeyhash (aka address) from the HD node.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode_ethereum_pubkeyhash(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode_ethereum_pubkeyhash(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
vstr_t pkh = {0};
@@ -448,7 +448,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_ethereum_pubkeyhash(mp_obj_t self) {
hdnode_get_ethereum_pubkeyhash(&o->hdnode, (uint8_t *)pkh.buf);
return mp_obj_new_bytes_from_vstr(&pkh);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_HDNode_ethereum_pubkeyhash_obj,
mod_trezorcrypto_HDNode_ethereum_pubkeyhash);
@@ -458,16 +458,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(
/// """
/// Cleans up sensitive memory.
/// """
-STATIC mp_obj_t mod_trezorcrypto_HDNode___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_HDNode___del__(mp_obj_t self) {
mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
o->fingerprint = 0;
memzero(&o->hdnode, sizeof(o->hdnode));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode___del___obj,
mod_trezorcrypto_HDNode___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_HDNode_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_HDNode_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR___del__),
MP_ROM_PTR(&mod_trezorcrypto_HDNode___del___obj)},
{MP_ROM_QSTR(MP_QSTR_derive),
@@ -505,7 +505,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_HDNode_locals_dict_table[] = {
MP_ROM_PTR(&mod_trezorcrypto_HDNode_ethereum_pubkeyhash_obj)},
#endif
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_HDNode_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_HDNode_locals_dict,
mod_trezorcrypto_HDNode_locals_dict_table);
// clang-format off
@@ -521,7 +521,7 @@ MP_DEFINE_CONST_OBJ_TYPE(mod_trezorcrypto_HDNode_type,
/// """
/// Construct a BIP0032 HD node from a BIP0039 seed value.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip32_from_seed(mp_obj_t seed,
+static mp_obj_t mod_trezorcrypto_bip32_from_seed(mp_obj_t seed,
mp_obj_t curve_name) {
mp_buffer_info_t seedb = {0};
mp_get_buffer_raise(seed, &seedb, MP_BUFFER_READ);
@@ -547,19 +547,19 @@ STATIC mp_obj_t mod_trezorcrypto_bip32_from_seed(mp_obj_t seed,
o->fingerprint = 0;
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_bip32_from_seed_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_bip32_from_seed_obj,
mod_trezorcrypto_bip32_from_seed);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip32_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_bip32_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bip32)},
{MP_ROM_QSTR(MP_QSTR_HDNode), MP_ROM_PTR(&mod_trezorcrypto_HDNode_type)},
{MP_ROM_QSTR(MP_QSTR_from_seed),
MP_ROM_PTR(&mod_trezorcrypto_bip32_from_seed_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip32_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip32_globals,
mod_trezorcrypto_bip32_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_bip32_module = {
+static const mp_obj_module_t mod_trezorcrypto_bip32_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_bip32_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip340.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip340.h
index edcb2d2f..61858584 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip340.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip340.h
@@ -31,7 +31,7 @@
/// """
/// Generate secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_generate_secret() {
+static mp_obj_t mod_trezorcrypto_bip340_generate_secret() {
vstr_t sk = {0};
vstr_init_len(&sk, 32);
for (;;) {
@@ -55,14 +55,14 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_generate_secret() {
}
return mp_obj_new_bytes_from_vstr(&sk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_bip340_generate_secret_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_bip340_generate_secret_obj,
mod_trezorcrypto_bip340_generate_secret);
/// def publickey(secret_key: AnyBytes) -> bytes:
/// """
/// Computes public key from secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_publickey(mp_obj_t secret_key) {
+static mp_obj_t mod_trezorcrypto_bip340_publickey(mp_obj_t secret_key) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
if (sk.len != 32) {
@@ -79,7 +79,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_publickey(mp_obj_t secret_key) {
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_publickey_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_publickey_obj,
mod_trezorcrypto_bip340_publickey);
/// def sign(
@@ -89,7 +89,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_publickey_obj,
/// """
/// Uses secret key to produce the signature of the digest.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_sign(mp_obj_t secret_key,
+static mp_obj_t mod_trezorcrypto_bip340_sign(mp_obj_t secret_key,
mp_obj_t digest) {
mp_buffer_info_t sk = {0}, dig = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
@@ -113,7 +113,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_sign(mp_obj_t secret_key,
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_bip340_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_bip340_sign_obj,
mod_trezorcrypto_bip340_sign);
/// def verify_publickey(public_key: AnyBytes) -> bool:
@@ -121,7 +121,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_bip340_sign_obj,
/// Verifies whether the public key is valid.
/// Returns True on success.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_verify_publickey(mp_obj_t public_key) {
+static mp_obj_t mod_trezorcrypto_bip340_verify_publickey(mp_obj_t public_key) {
mp_buffer_info_t pk = {0};
mp_get_buffer_raise(public_key, &pk, MP_BUFFER_READ);
if (pk.len != 32) {
@@ -130,7 +130,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_verify_publickey(mp_obj_t public_key) {
int ret = zkp_bip340_verify_publickey((const uint8_t *)pk.buf);
return mp_obj_new_bool(ret == 0);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_verify_publickey_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_verify_publickey_obj,
mod_trezorcrypto_bip340_verify_publickey);
/// def verify(
@@ -140,7 +140,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip340_verify_publickey_obj,
/// Uses public key to verify the signature of the digest.
/// Returns True on success.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_verify(mp_obj_t public_key,
+static mp_obj_t mod_trezorcrypto_bip340_verify(mp_obj_t public_key,
mp_obj_t signature,
mp_obj_t digest) {
mp_buffer_info_t pk = {0}, sig = {0}, dig = {0};
@@ -161,7 +161,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_verify(mp_obj_t public_key,
(const uint8_t *)dig.buf);
return mp_obj_new_bool(ret == 0);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_bip340_verify_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_bip340_verify_obj,
mod_trezorcrypto_bip340_verify);
/// def tweak_public_key(
@@ -171,7 +171,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_bip340_verify_obj,
/// """
/// Tweaks the public key with the specified root_hash.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_tweak_public_key(size_t n_args,
+static mp_obj_t mod_trezorcrypto_bip340_tweak_public_key(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t pk = {0};
mp_get_buffer_raise(args[0], &pk, MP_BUFFER_READ);
@@ -200,7 +200,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_tweak_public_key(size_t n_args,
return mp_obj_new_bytes_from_vstr(&tpk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_bip340_tweak_public_key_obj, 1, 2,
mod_trezorcrypto_bip340_tweak_public_key);
@@ -211,7 +211,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Tweaks the secret key with the specified root_hash.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip340_tweak_secret_key(size_t n_args,
+static mp_obj_t mod_trezorcrypto_bip340_tweak_secret_key(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
@@ -240,11 +240,11 @@ STATIC mp_obj_t mod_trezorcrypto_bip340_tweak_secret_key(size_t n_args,
return mp_obj_new_bytes_from_vstr(&tsk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_bip340_tweak_secret_key_obj, 1, 2,
mod_trezorcrypto_bip340_tweak_secret_key);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip340_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_bip340_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bip340)},
{MP_ROM_QSTR(MP_QSTR_generate_secret),
MP_ROM_PTR(&mod_trezorcrypto_bip340_generate_secret_obj)},
@@ -259,10 +259,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip340_globals_table[] = {
MP_ROM_PTR(&mod_trezorcrypto_bip340_tweak_public_key_obj)},
{MP_ROM_QSTR(MP_QSTR_tweak_secret_key),
MP_ROM_PTR(&mod_trezorcrypto_bip340_tweak_secret_key_obj)}};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip340_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip340_globals,
mod_trezorcrypto_bip340_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_bip340_module = {
+static const mp_obj_module_t mod_trezorcrypto_bip340_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_bip340_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip39.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip39.h
index 2d18f160..d3e66cb5 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip39.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-bip39.h
@@ -29,7 +29,7 @@
/// """
/// Generate a mnemonic from given data (of 16, 20, 24, 28 and 32 bytes).
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip39_from_data(mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_bip39_from_data(mp_obj_t data) {
mp_buffer_info_t bin = {0};
mp_get_buffer_raise(data, &bin, MP_BUFFER_READ);
if (bin.len % 4 || bin.len < 16 || bin.len > 32) {
@@ -42,20 +42,20 @@ STATIC mp_obj_t mod_trezorcrypto_bip39_from_data(mp_obj_t data) {
mnemonic_clear();
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_from_data_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_from_data_obj,
mod_trezorcrypto_bip39_from_data);
/// def check(mnemonic: str) -> bool:
/// """
/// Check whether given mnemonic is valid.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip39_check(mp_obj_t mnemonic) {
+static mp_obj_t mod_trezorcrypto_bip39_check(mp_obj_t mnemonic) {
mp_buffer_info_t text = {0};
mp_get_buffer_raise(mnemonic, &text, MP_BUFFER_READ);
return (text.len > 0 && mnemonic_check(text.buf)) ? mp_const_true
: mp_const_false;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_check_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_check_obj,
mod_trezorcrypto_bip39_check);
/// def seed(
@@ -66,7 +66,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_check_obj,
/// """
/// Generate seed from mnemonic and passphrase.
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip39_seed(size_t n_args,
+static mp_obj_t mod_trezorcrypto_bip39_seed(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t mnemo = {0};
mp_buffer_info_t phrase = {0};
@@ -88,7 +88,7 @@ STATIC mp_obj_t mod_trezorcrypto_bip39_seed(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&seed);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bip39_seed_obj, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bip39_seed_obj, 2,
3, mod_trezorcrypto_bip39_seed);
#if !BITCOIN_ONLY
@@ -96,7 +96,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_bip39_seed_obj, 2,
/// """
/// Convert the mnemonic to its binary representation (including checksum).
/// """
-STATIC mp_obj_t mod_trezorcrypto_bip39_mnemonic_to_bits(mp_obj_t mnemonic) {
+static mp_obj_t mod_trezorcrypto_bip39_mnemonic_to_bits(mp_obj_t mnemonic) {
mp_buffer_info_t text = {0};
mp_get_buffer_raise(mnemonic, &text, MP_BUFFER_READ);
@@ -107,11 +107,11 @@ STATIC mp_obj_t mod_trezorcrypto_bip39_mnemonic_to_bits(mp_obj_t mnemonic) {
}
return mp_obj_new_bytes(bits, (binary_mnemonics_len + 7) / 8);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_mnemonic_to_bits_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_bip39_mnemonic_to_bits_obj,
mod_trezorcrypto_bip39_mnemonic_to_bits);
#endif // !BITCOIN_ONLY
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip39_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_bip39_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bip39)},
{MP_ROM_QSTR(MP_QSTR_from_data),
MP_ROM_PTR(&mod_trezorcrypto_bip39_from_data_obj)},
@@ -122,10 +122,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_bip39_globals_table[] = {
MP_ROM_PTR(&mod_trezorcrypto_bip39_mnemonic_to_bits_obj)},
#endif // !BITCOIN_ONLY
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip39_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_bip39_globals,
mod_trezorcrypto_bip39_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_bip39_module = {
+static const mp_obj_module_t mod_trezorcrypto_bip39_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_bip39_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake256.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake256.h
index 16336be1..b4b36de2 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake256.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake256.h
@@ -35,13 +35,13 @@ typedef struct _mp_obj_Blake256_t {
BLAKE256_CTX ctx;
} mp_obj_Blake256_t;
-STATIC mp_obj_t mod_trezorcrypto_Blake256_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Blake256_update(mp_obj_t self, mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake256_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Blake256_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -58,7 +58,7 @@ STATIC mp_obj_t mod_trezorcrypto_Blake256_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake256_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Blake256_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Blake256_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -67,14 +67,14 @@ STATIC mp_obj_t mod_trezorcrypto_Blake256_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake256_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake256_update_obj,
mod_trezorcrypto_Blake256_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake256_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake256_digest(mp_obj_t self) {
mp_obj_Blake256_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, BLAKE256_DIGEST_LENGTH);
@@ -84,18 +84,18 @@ STATIC mp_obj_t mod_trezorcrypto_Blake256_digest(mp_obj_t self) {
memzero(&ctx, sizeof(BLAKE256_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake256_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake256_digest_obj,
mod_trezorcrypto_Blake256_digest);
-STATIC mp_obj_t mod_trezorcrypto_Blake256___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake256___del__(mp_obj_t self) {
mp_obj_Blake256_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(BLAKE256_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake256___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake256___del___obj,
mod_trezorcrypto_Blake256___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake256_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Blake256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Blake256_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -105,7 +105,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(BLAKE256_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(BLAKE256_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake256_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake256_locals_dict,
mod_trezorcrypto_Blake256_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2b.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2b.h
index 540c929d..3b71205a 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2b.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2b.h
@@ -37,7 +37,7 @@ typedef struct _mp_obj_Blake2b_t {
BLAKE2B_CTX ctx;
} mp_obj_Blake2b_t;
-STATIC mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -49,10 +49,10 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data);
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2b_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Blake2b_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_data, MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes}},
{MP_QSTR_outlen,
MP_ARG_KW_ONLY | MP_ARG_INT,
@@ -112,7 +112,7 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2b_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Blake2b_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -121,14 +121,14 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2b_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake2b_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake2b_update_obj,
mod_trezorcrypto_Blake2b_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2b_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake2b_digest(mp_obj_t self) {
mp_obj_Blake2b_t *o = MP_OBJ_TO_PTR(self);
BLAKE2B_CTX ctx = {0};
memcpy(&ctx, &(o->ctx), sizeof(BLAKE2B_CTX));
@@ -138,18 +138,18 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2b_digest(mp_obj_t self) {
memzero(&ctx, sizeof(BLAKE2B_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2b_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2b_digest_obj,
mod_trezorcrypto_Blake2b_digest);
-STATIC mp_obj_t mod_trezorcrypto_Blake2b___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake2b___del__(mp_obj_t self) {
mp_obj_Blake2b_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(BLAKE2B_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2b___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2b___del___obj,
mod_trezorcrypto_Blake2b___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake2b_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Blake2b_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Blake2b_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -159,7 +159,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake2b_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(BLAKE2B_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(BLAKE2B_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake2b_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake2b_locals_dict,
mod_trezorcrypto_Blake2b_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2s.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2s.h
index b674f0ae..15dc51ef 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2s.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-blake2s.h
@@ -37,7 +37,7 @@ typedef struct _mp_obj_Blake2s_t {
BLAKE2S_CTX ctx;
} mp_obj_Blake2s_t;
-STATIC mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -49,10 +49,10 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data);
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2s_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Blake2s_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_data, MP_ARG_OBJ, {.u_obj = mp_const_empty_bytes}},
{MP_QSTR_outlen,
MP_ARG_KW_ONLY | MP_ARG_INT,
@@ -112,7 +112,7 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2s_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Blake2s_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -121,14 +121,14 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2s_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake2s_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Blake2s_update_obj,
mod_trezorcrypto_Blake2s_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Blake2s_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake2s_digest(mp_obj_t self) {
mp_obj_Blake2s_t *o = MP_OBJ_TO_PTR(self);
BLAKE2S_CTX ctx = {0};
memcpy(&ctx, &(o->ctx), sizeof(BLAKE2S_CTX));
@@ -138,18 +138,18 @@ STATIC mp_obj_t mod_trezorcrypto_Blake2s_digest(mp_obj_t self) {
memzero(&ctx, sizeof(BLAKE2S_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2s_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2s_digest_obj,
mod_trezorcrypto_Blake2s_digest);
-STATIC mp_obj_t mod_trezorcrypto_Blake2s___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Blake2s___del__(mp_obj_t self) {
mp_obj_Blake2s_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(BLAKE2S_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2s___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Blake2s___del___obj,
mod_trezorcrypto_Blake2s___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake2s_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Blake2s_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Blake2s_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -159,7 +159,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Blake2s_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(BLAKE2S_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(BLAKE2S_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake2s_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Blake2s_locals_dict,
mod_trezorcrypto_Blake2s_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-cardano.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-cardano.h
index 7a159fc6..68cf8f7a 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-cardano.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-cardano.h
@@ -44,7 +44,7 @@
/// scheme. If `trezor_derivation` is True, the Icarus-Trezor variant is
/// used (see CIP-3).
/// """
-STATIC mp_obj_t mod_trezorcrypto_cardano_derive_icarus(size_t n_args,
+static mp_obj_t mod_trezorcrypto_cardano_derive_icarus(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t binary_mnemonic = {0}, phrase = {0};
mp_get_buffer_raise(args[0], &binary_mnemonic, MP_BUFFER_READ);
@@ -89,7 +89,7 @@ STATIC mp_obj_t mod_trezorcrypto_cardano_derive_icarus(size_t n_args,
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_cardano_derive_icarus_obj, 3, 4,
mod_trezorcrypto_cardano_derive_icarus);
@@ -97,7 +97,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Creates a Cardano HD node from a master secret.
/// """
-STATIC mp_obj_t mod_trezorcrypto_from_secret(mp_obj_t secret) {
+static mp_obj_t mod_trezorcrypto_from_secret(mp_obj_t secret) {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(secret, &bufinfo, MP_BUFFER_READ);
if (bufinfo.len != CARDANO_SECRET_LENGTH) {
@@ -117,14 +117,14 @@ STATIC mp_obj_t mod_trezorcrypto_from_secret(mp_obj_t secret) {
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_secret_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_secret_obj,
mod_trezorcrypto_from_secret);
/// def from_seed_slip23(seed: AnyBytes) -> HDNode:
/// """
/// Creates a Cardano HD node from a seed via SLIP-23 derivation.
/// """
-STATIC mp_obj_t mod_trezorcrypto_from_seed_slip23(mp_obj_t seed) {
+static mp_obj_t mod_trezorcrypto_from_seed_slip23(mp_obj_t seed) {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(seed, &bufinfo, MP_BUFFER_READ);
if (bufinfo.len == 0) {
@@ -154,14 +154,14 @@ STATIC mp_obj_t mod_trezorcrypto_from_seed_slip23(mp_obj_t seed) {
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_seed_slip23_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_seed_slip23_obj,
mod_trezorcrypto_from_seed_slip23);
/// def from_seed_ledger(seed: AnyBytes) -> HDNode:
/// """
/// Creates a Cardano HD node from a seed via Ledger derivation.
/// """
-STATIC mp_obj_t mod_trezorcrypto_from_seed_ledger(mp_obj_t seed) {
+static mp_obj_t mod_trezorcrypto_from_seed_ledger(mp_obj_t seed) {
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(seed, &bufinfo, MP_BUFFER_READ);
if (bufinfo.len == 0) {
@@ -191,10 +191,10 @@ STATIC mp_obj_t mod_trezorcrypto_from_seed_ledger(mp_obj_t seed) {
return MP_OBJ_FROM_PTR(o);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_seed_ledger_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_from_seed_ledger_obj,
mod_trezorcrypto_from_seed_ledger);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_cardano_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_cardano_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cardano)},
{MP_ROM_QSTR(MP_QSTR_derive_icarus),
MP_ROM_PTR(&mod_trezorcrypto_cardano_derive_icarus_obj)},
@@ -205,10 +205,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_cardano_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_from_seed_ledger),
MP_ROM_PTR(&mod_trezorcrypto_from_seed_ledger_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_cardano_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_cardano_globals,
mod_trezorcrypto_cardano_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_cardano_module = {
+static const mp_obj_module_t mod_trezorcrypto_cardano_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_cardano_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-chacha20poly1305.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-chacha20poly1305.h
index 09a22187..5f7e7a29 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-chacha20poly1305.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-chacha20poly1305.h
@@ -47,7 +47,7 @@ typedef struct _mp_obj_ChaCha20Poly1305_t {
/// Initialize the ChaCha20 + Poly1305 context for encryption
/// using a 32 byte key and 12 byte nonce as in the RFC 7539 style.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_make_new(
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_make_new(
const mp_obj_type_t *type, size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 2, 2, false);
@@ -75,7 +75,7 @@ STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_make_new(
/// style with 16 byte padding. This must only be called once and prior
/// to encryption.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_auth(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_auth(mp_obj_t self,
mp_obj_t data) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
if (o->state != INIT) {
@@ -88,7 +88,7 @@ STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_auth(mp_obj_t self,
o->alen += in.len;
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_auth_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_auth_obj,
mod_trezorcrypto_ChaCha20Poly1305_auth);
/// def encrypt(self, data: AnyBytes) -> bytes:
@@ -96,7 +96,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_auth_obj,
/// Encrypt data (length of data must be divisible by 64 except for the
/// final value).
/// """
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_encrypt(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_encrypt(mp_obj_t self,
mp_obj_t data) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
if (o->state != INIT && o->state != PROCESSING) {
@@ -111,15 +111,15 @@ STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_encrypt(mp_obj_t self,
o->plen += in.len;
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_encrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_encrypt_obj,
mod_trezorcrypto_ChaCha20Poly1305_encrypt);
/// def finish(self) -> bytes:
/// """
/// Compute RFC 7539-style Poly1305 MAC.
/// """
-STATIC mp_obj_t
-mod_trezorcrypto_ChaCha20Poly1305_encrypt_finish(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_encrypt_finish(
+ mp_obj_t self) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
if (o->state != INIT && o->state != PROCESSING) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Invalid state."));
@@ -131,7 +131,7 @@ mod_trezorcrypto_ChaCha20Poly1305_encrypt_finish(mp_obj_t self) {
rfc7539_finish(&(o->ctx), o->alen, o->plen, (uint8_t *)mac.buf);
return mp_obj_new_bytes_from_vstr(&mac);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_ChaCha20Poly1305_encrypt_finish_obj,
mod_trezorcrypto_ChaCha20Poly1305_encrypt_finish);
@@ -158,7 +158,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(
/// Decrypt data (length of data must be divisible by 64 except for the
/// final value).
/// """
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt(mp_obj_t self,
mp_obj_t data) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
if (o->state != INIT && o->state != PROCESSING) {
@@ -173,14 +173,14 @@ STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt(mp_obj_t self,
o->plen += in.len;
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_decrypt_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ChaCha20Poly1305_decrypt_obj,
mod_trezorcrypto_ChaCha20Poly1305_decrypt);
/// def finish(self, expected_mac: AnyBytes) -> None:
/// """
/// Verify RFC 7539-style Poly1305 MAC.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt_finish(
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt_finish(
mp_obj_t self, mp_obj_t expected_mac) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
if (o->state != INIT && o->state != PROCESSING) {
@@ -205,21 +205,21 @@ STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305_decrypt_finish(
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(
+static MP_DEFINE_CONST_FUN_OBJ_2(
mod_trezorcrypto_ChaCha20Poly1305_decrypt_finish_obj,
mod_trezorcrypto_ChaCha20Poly1305_decrypt_finish);
-STATIC mp_obj_t mod_trezorcrypto_ChaCha20Poly1305___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_ChaCha20Poly1305___del__(mp_obj_t self) {
mp_obj_ChaCha20Poly1305_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(chacha20poly1305_ctx));
o->alen = 0;
o->plen = 0;
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_ChaCha20Poly1305___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_ChaCha20Poly1305___del___obj,
mod_trezorcrypto_ChaCha20Poly1305___del__);
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_ChaCha20Poly1305Encrypt_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_encrypt),
MP_ROM_PTR(&mod_trezorcrypto_ChaCha20Poly1305_encrypt_obj)},
@@ -230,11 +230,11 @@ STATIC const mp_rom_map_elem_t
{MP_ROM_QSTR(MP_QSTR___del__),
MP_ROM_PTR(&mod_trezorcrypto_ChaCha20Poly1305___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(
+static MP_DEFINE_CONST_DICT(
mod_trezorcrypto_ChaCha20Poly1305Encrypt_locals_dict,
mod_trezorcrypto_ChaCha20Poly1305Encrypt_locals_dict_table);
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_ChaCha20Poly1305Decrypt_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_decrypt),
MP_ROM_PTR(&mod_trezorcrypto_ChaCha20Poly1305_decrypt_obj)},
@@ -245,7 +245,7 @@ STATIC const mp_rom_map_elem_t
{MP_ROM_QSTR(MP_QSTR___del__),
MP_ROM_PTR(&mod_trezorcrypto_ChaCha20Poly1305___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(
+static MP_DEFINE_CONST_DICT(
mod_trezorcrypto_ChaCha20Poly1305Decrypt_locals_dict,
mod_trezorcrypto_ChaCha20Poly1305Decrypt_locals_dict_table);
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-crc.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-crc.h
index 61f283c4..bd10ea3b 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-crc.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-crc.h
@@ -44,17 +44,17 @@ mp_obj_t mod_trezorcrypto_crc_crc32(size_t n_args, const mp_obj_t *args) {
crc = checksum_crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff);
return mp_obj_new_int_from_uint(crc ^ 0xffffffff);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_crc_crc32_obj, 1, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_crc_crc32_obj, 1, 2,
mod_trezorcrypto_crc_crc32);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_crc_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_crc_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_crc)},
{MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_trezorcrypto_crc_crc32_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_crc_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_crc_globals,
mod_trezorcrypto_crc_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_crc_module = {
+static const mp_obj_module_t mod_trezorcrypto_crc_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_crc_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-curve25519.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-curve25519.h
index b2fefecf..b693e729 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-curve25519.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-curve25519.h
@@ -29,7 +29,7 @@
/// """
/// Generate secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_curve25519_generate_secret() {
+static mp_obj_t mod_trezorcrypto_curve25519_generate_secret() {
vstr_t sk = {0};
vstr_init_len(&sk, 32);
rng_fill_buffer((uint8_t *)sk.buf, sk.len);
@@ -39,7 +39,7 @@ STATIC mp_obj_t mod_trezorcrypto_curve25519_generate_secret() {
sk.buf[31] |= 64;
return mp_obj_new_bytes_from_vstr(&sk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(
+static MP_DEFINE_CONST_FUN_OBJ_0(
mod_trezorcrypto_curve25519_generate_secret_obj,
mod_trezorcrypto_curve25519_generate_secret);
@@ -47,7 +47,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(
/// """
/// Computes public key from secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_curve25519_publickey(mp_obj_t secret_key) {
+static mp_obj_t mod_trezorcrypto_curve25519_publickey(mp_obj_t secret_key) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
if (sk.len != 32) {
@@ -58,7 +58,7 @@ STATIC mp_obj_t mod_trezorcrypto_curve25519_publickey(mp_obj_t secret_key) {
curve25519_scalarmult_basepoint((uint8_t *)pk.buf, (const uint8_t *)sk.buf);
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_curve25519_publickey_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_curve25519_publickey_obj,
mod_trezorcrypto_curve25519_publickey);
/// def multiply(secret_key: AnyBytes, public_key: AnyBytes) -> bytes:
@@ -66,7 +66,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_curve25519_publickey_obj,
/// Multiplies point defined by public_key with scalar defined by
/// secret_key. Useful for ECDH.
/// """
-STATIC mp_obj_t mod_trezorcrypto_curve25519_multiply(mp_obj_t secret_key,
+static mp_obj_t mod_trezorcrypto_curve25519_multiply(mp_obj_t secret_key,
mp_obj_t public_key) {
mp_buffer_info_t sk = {0}, pk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
@@ -83,10 +83,10 @@ STATIC mp_obj_t mod_trezorcrypto_curve25519_multiply(mp_obj_t secret_key,
(const uint8_t *)pk.buf);
return mp_obj_new_bytes_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_curve25519_multiply_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_curve25519_multiply_obj,
mod_trezorcrypto_curve25519_multiply);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_curve25519_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_curve25519_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_curve25519)},
{MP_ROM_QSTR(MP_QSTR_generate_secret),
MP_ROM_PTR(&mod_trezorcrypto_curve25519_generate_secret_obj)},
@@ -95,10 +95,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_curve25519_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_multiply),
MP_ROM_PTR(&mod_trezorcrypto_curve25519_multiply_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_curve25519_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_curve25519_globals,
mod_trezorcrypto_curve25519_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_curve25519_module = {
+static const mp_obj_module_t mod_trezorcrypto_curve25519_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_curve25519_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ed25519.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ed25519.h
index b159824c..36864ec8 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ed25519.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ed25519.h
@@ -30,20 +30,20 @@
/// """
/// Generate secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_generate_secret() {
+static mp_obj_t mod_trezorcrypto_ed25519_generate_secret() {
vstr_t sk = {0};
vstr_init_len(&sk, 32);
rng_fill_buffer((uint8_t *)sk.buf, sk.len);
return mp_obj_new_bytes_from_vstr(&sk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_ed25519_generate_secret_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_ed25519_generate_secret_obj,
mod_trezorcrypto_ed25519_generate_secret);
/// def publickey(secret_key: AnyBytes) -> bytes:
/// """
/// Computes public key from secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_publickey(mp_obj_t secret_key) {
+static mp_obj_t mod_trezorcrypto_ed25519_publickey(mp_obj_t secret_key) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
if (sk.len != 32) {
@@ -55,7 +55,7 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_publickey(mp_obj_t secret_key) {
*(ed25519_public_key *)pk.buf);
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_ed25519_publickey_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_ed25519_publickey_obj,
mod_trezorcrypto_ed25519_publickey);
/// def sign(
@@ -64,7 +64,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_ed25519_publickey_obj,
/// """
/// Uses secret key to produce the signature of message.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_sign(size_t n_args,
+static mp_obj_t mod_trezorcrypto_ed25519_sign(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0}, msg = {0};
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
@@ -96,7 +96,7 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_sign(size_t n_args,
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_ed25519_sign_obj, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_ed25519_sign_obj, 2,
3, mod_trezorcrypto_ed25519_sign);
#if !BITCOIN_ONLY
@@ -107,7 +107,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_ed25519_sign_obj, 2,
/// """
/// Uses extended secret key to produce the cardano signature of message.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_sign_ext(mp_obj_t secret_scalar,
+static mp_obj_t mod_trezorcrypto_ed25519_sign_ext(mp_obj_t secret_scalar,
mp_obj_t secret_extension,
mp_obj_t message) {
mp_buffer_info_t sk = {0}, skext = {0}, msg = {0};
@@ -131,7 +131,7 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_sign_ext(mp_obj_t secret_scalar,
*(ed25519_signature *)sig.buf);
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_ed25519_sign_ext_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_ed25519_sign_ext_obj,
mod_trezorcrypto_ed25519_sign_ext);
#endif
@@ -143,7 +143,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_ed25519_sign_ext_obj,
/// Uses public key to verify the signature of the message.
/// Returns True on success.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_verify(mp_obj_t public_key,
+static mp_obj_t mod_trezorcrypto_ed25519_verify(mp_obj_t public_key,
mp_obj_t signature,
mp_obj_t message) {
mp_buffer_info_t pk = {0}, sig = {0}, msg = {0};
@@ -165,15 +165,15 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_verify(mp_obj_t public_key,
? mp_const_true
: mp_const_false;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_ed25519_verify_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_ed25519_verify_obj,
mod_trezorcrypto_ed25519_verify);
/// def cosi_combine_publickeys(public_keys: Sequence[AnyBytes]) -> bytes:
/// """
/// Combines a list of public keys used in COSI cosigning scheme.
/// """
-STATIC mp_obj_t
-mod_trezorcrypto_ed25519_cosi_combine_publickeys(mp_obj_t public_keys) {
+static mp_obj_t mod_trezorcrypto_ed25519_cosi_combine_publickeys(
+ mp_obj_t public_keys) {
size_t pklen = 0;
mp_obj_t *pkitems = NULL;
mp_obj_get_array(public_keys, &pklen, &pkitems);
@@ -200,7 +200,7 @@ mod_trezorcrypto_ed25519_cosi_combine_publickeys(mp_obj_t public_keys) {
}
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_ed25519_cosi_combine_publickeys_obj,
mod_trezorcrypto_ed25519_cosi_combine_publickeys);
@@ -210,7 +210,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(
/// """
/// Combines a list of signatures used in COSI cosigning scheme.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_combine_signatures(
+static mp_obj_t mod_trezorcrypto_ed25519_cosi_combine_signatures(
mp_obj_t R, mp_obj_t signatures) {
mp_buffer_info_t sigR = {0};
mp_get_buffer_raise(R, &sigR, MP_BUFFER_READ);
@@ -241,7 +241,7 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_combine_signatures(
siglen);
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(
+static MP_DEFINE_CONST_FUN_OBJ_2(
mod_trezorcrypto_ed25519_cosi_combine_signatures_obj,
mod_trezorcrypto_ed25519_cosi_combine_signatures);
@@ -249,7 +249,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(
/// """
/// Generate a nonce and commitment for the CoSi cosigning scheme.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_commit() {
+static mp_obj_t mod_trezorcrypto_ed25519_cosi_commit() {
vstr_t nonce = {0};
vstr_t commitment = {0};
vstr_init_len(&nonce, 32);
@@ -261,7 +261,7 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_commit() {
tuple->items[1] = mp_obj_new_bytes_from_vstr(&commitment);
return MP_OBJ_FROM_PTR(tuple);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_ed25519_cosi_commit_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_ed25519_cosi_commit_obj,
mod_trezorcrypto_ed25519_cosi_commit);
/// def cosi_sign(
@@ -274,7 +274,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_ed25519_cosi_commit_obj,
/// """
/// Produce signature of message using COSI cosigning scheme.
/// """
-STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_sign(size_t n_args,
+static mp_obj_t mod_trezorcrypto_ed25519_cosi_sign(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0}, msg = {0}, nonce = {0}, sigR = {0}, pk = {0};
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
@@ -308,11 +308,11 @@ STATIC mp_obj_t mod_trezorcrypto_ed25519_cosi_sign(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_ed25519_cosi_sign_obj, 5, 5,
mod_trezorcrypto_ed25519_cosi_sign);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_ed25519_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_ed25519_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ed25519)},
{MP_ROM_QSTR(MP_QSTR_generate_secret),
MP_ROM_PTR(&mod_trezorcrypto_ed25519_generate_secret_obj)},
@@ -334,10 +334,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_ed25519_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_cosi_sign),
MP_ROM_PTR(&mod_trezorcrypto_ed25519_cosi_sign_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_ed25519_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_ed25519_globals,
mod_trezorcrypto_ed25519_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_ed25519_module = {
+static const mp_obj_module_t mod_trezorcrypto_ed25519_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_ed25519_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-elligator2.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-elligator2.h
index 9eef8f83..dcaf2c44 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-elligator2.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-elligator2.h
@@ -46,19 +46,19 @@ mp_obj_t mod_trezorcrypto_elligator2_map_to_curve25519(mp_obj_t input) {
return mp_obj_new_bytes_from_vstr(&output_vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_elligator2_map_to_curve25519_obj,
mod_trezorcrypto_elligator2_map_to_curve25519);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_elligator2_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_elligator2_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_elligator2)},
{MP_ROM_QSTR(MP_QSTR_map_to_curve25519),
MP_ROM_PTR(&mod_trezorcrypto_elligator2_map_to_curve25519_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_elligator2_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_elligator2_globals,
mod_trezorcrypto_elligator2_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_elligator2_module = {
+static const mp_obj_module_t mod_trezorcrypto_elligator2_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_elligator2_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-groestl.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-groestl.h
index 159d970f..38abd733 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-groestl.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-groestl.h
@@ -38,14 +38,14 @@ typedef struct _mp_obj_Groestl512_t {
GROESTL512_CTX ctx;
} mp_obj_Groestl512_t;
-STATIC mp_obj_t mod_trezorcrypto_Groestl512_update(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_Groestl512_update(mp_obj_t self,
mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Groestl512_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Groestl512_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -62,7 +62,7 @@ STATIC mp_obj_t mod_trezorcrypto_Groestl512_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Groestl512_update(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_Groestl512_update(mp_obj_t self,
mp_obj_t data) {
mp_obj_Groestl512_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
@@ -72,14 +72,14 @@ STATIC mp_obj_t mod_trezorcrypto_Groestl512_update(mp_obj_t self,
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Groestl512_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Groestl512_update_obj,
mod_trezorcrypto_Groestl512_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Groestl512_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Groestl512_digest(mp_obj_t self) {
mp_obj_Groestl512_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, GROESTL512_DIGEST_LENGTH);
@@ -89,19 +89,19 @@ STATIC mp_obj_t mod_trezorcrypto_Groestl512_digest(mp_obj_t self) {
memzero(&ctx, sizeof(GROESTL512_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Groestl512_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Groestl512_digest_obj,
mod_trezorcrypto_Groestl512_digest);
-STATIC mp_obj_t mod_trezorcrypto_Groestl512___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Groestl512___del__(mp_obj_t self) {
mp_obj_Groestl512_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(GROESTL512_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Groestl512___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Groestl512___del___obj,
mod_trezorcrypto_Groestl512___del__);
-STATIC const mp_rom_map_elem_t
- mod_trezorcrypto_Groestl512_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Groestl512_locals_dict_table[] =
+ {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Groestl512_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -112,7 +112,7 @@ STATIC const mp_rom_map_elem_t
{MP_ROM_QSTR(MP_QSTR_digest_size),
MP_ROM_INT(GROESTL512_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Groestl512_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Groestl512_locals_dict,
mod_trezorcrypto_Groestl512_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-hmac.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-hmac.h
index 286b50a1..fcfc2a88 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-hmac.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-hmac.h
@@ -42,7 +42,7 @@ typedef struct _mp_obj_Hmac_t {
uint32_t hashtype;
} mp_obj_Hmac_t;
-STATIC mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -53,7 +53,7 @@ STATIC mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t data);
/// """
/// Create a HMAC context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Hmac_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Hmac_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 2, 3, false);
@@ -86,7 +86,7 @@ STATIC mp_obj_t mod_trezorcrypto_Hmac_make_new(const mp_obj_type_t *type,
/// """
/// Update a HMAC context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t message) {
+static mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t message) {
mp_obj_Hmac_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(message, &msg, MP_BUFFER_READ);
@@ -99,14 +99,14 @@ STATIC mp_obj_t mod_trezorcrypto_Hmac_update(mp_obj_t self, mp_obj_t message) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Hmac_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Hmac_update_obj,
mod_trezorcrypto_Hmac_update);
/// def digest(self) -> bytes:
/// """
/// Return the digest of processed data so far.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Hmac_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Hmac_digest(mp_obj_t self) {
mp_obj_Hmac_t *o = MP_OBJ_TO_PTR(self);
vstr_t mac = {0};
if (o->hashtype == SHA256) {
@@ -126,19 +126,19 @@ STATIC mp_obj_t mod_trezorcrypto_Hmac_digest(mp_obj_t self) {
}
return mp_obj_new_bytes_from_vstr(&mac);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Hmac_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Hmac_digest_obj,
mod_trezorcrypto_Hmac_digest);
-STATIC mp_obj_t mod_trezorcrypto_Hmac___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Hmac___del__(mp_obj_t self) {
mp_obj_Hmac_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx256), sizeof(HMAC_SHA256_CTX));
memzero(&(o->ctx512), sizeof(HMAC_SHA512_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Hmac___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Hmac___del___obj,
mod_trezorcrypto_Hmac___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Hmac_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Hmac_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Hmac_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -148,7 +148,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Hmac_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_SHA256), MP_ROM_INT(SHA256)},
{MP_ROM_QSTR(MP_QSTR_SHA512), MP_ROM_INT(SHA512)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Hmac_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Hmac_locals_dict,
mod_trezorcrypto_Hmac_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-mcu.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-mcu.h
index 6e29c064..4d0469b1 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-mcu.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-mcu.h
@@ -27,7 +27,7 @@
/// """
/// Return MCU device certificate.
/// """
-STATIC mp_obj_t mod_trezorcrypto_mcu_get_certificate(void) {
+static mp_obj_t mod_trezorcrypto_mcu_get_certificate(void) {
size_t cert_size = 0;
if (mcu_attestation_cert_size(&cert_size) != sectrue) {
mp_raise_msg(&mp_type_RuntimeError,
@@ -46,14 +46,14 @@ STATIC mp_obj_t mod_trezorcrypto_mcu_get_certificate(void) {
cert.len = cert_size;
return mp_obj_new_bytes_from_vstr(&cert);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_mcu_get_certificate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_mcu_get_certificate_obj,
mod_trezorcrypto_mcu_get_certificate);
/// def sign(challenge: AnyBytes) -> bytes:
/// """
/// Sign challenge bytes with MCU device attestation key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_mcu_sign(mp_obj_t challenge) {
+static mp_obj_t mod_trezorcrypto_mcu_sign(mp_obj_t challenge) {
mp_buffer_info_t challenge_buf = {0};
mp_get_buffer_raise(challenge, &challenge_buf, MP_BUFFER_READ);
@@ -68,19 +68,19 @@ STATIC mp_obj_t mod_trezorcrypto_mcu_sign(mp_obj_t challenge) {
sig.len = MCU_ATTESTATION_SIG_SIZE;
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_mcu_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_mcu_sign_obj,
mod_trezorcrypto_mcu_sign);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_mcu_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_mcu_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_mcu)},
{MP_ROM_QSTR(MP_QSTR_get_certificate),
MP_ROM_PTR(&mod_trezorcrypto_mcu_get_certificate_obj)},
{MP_ROM_QSTR(MP_QSTR_sign), MP_ROM_PTR(&mod_trezorcrypto_mcu_sign_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_mcu_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_mcu_globals,
mod_trezorcrypto_mcu_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_mcu_module = {
+static const mp_obj_module_t mod_trezorcrypto_mcu_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_mcu_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-monero.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-monero.h
index bc168864..10438e31 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-monero.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-monero.h
@@ -49,8 +49,8 @@ typedef struct _mp_obj_bignum256modm_t {
// Helpers
//
-STATIC const mp_obj_type_t mod_trezorcrypto_monero_ge25519_type;
-STATIC const mp_obj_type_t mod_trezorcrypto_monero_bignum256modm_type;
+static const mp_obj_type_t mod_trezorcrypto_monero_ge25519_type;
+static const mp_obj_type_t mod_trezorcrypto_monero_bignum256modm_type;
STATIC const mp_obj_type_t mod_trezorcrypto_monero_hasher_type;
#define MP_OBJ_IS_GE25519(o) \
@@ -78,14 +78,14 @@ static inline void assert_scalar(const mp_obj_t o) {
}
}
-STATIC mp_obj_t mp_obj_new_scalar() {
+static mp_obj_t mp_obj_new_scalar() {
mp_obj_bignum256modm_t *o = mp_obj_malloc_with_finaliser(
mp_obj_bignum256modm_t, &mod_trezorcrypto_monero_bignum256modm_type);
set256_modm(o->p, 0);
return MP_OBJ_FROM_PTR(o);
}
-STATIC mp_obj_t mp_obj_new_scalar_r(mp_obj_t r) {
+static mp_obj_t mp_obj_new_scalar_r(mp_obj_t r) {
if (r == mp_const_none) {
return mp_obj_new_scalar();
}
@@ -94,14 +94,14 @@ STATIC mp_obj_t mp_obj_new_scalar_r(mp_obj_t r) {
return r;
}
-STATIC mp_obj_t mp_obj_new_ge25519() {
+static mp_obj_t mp_obj_new_ge25519() {
mp_obj_ge25519_t *o = mp_obj_malloc_with_finaliser(
mp_obj_ge25519_t, &mod_trezorcrypto_monero_ge25519_type);
ge25519_set_neutral(&o->p);
return MP_OBJ_FROM_PTR(o);
}
-STATIC mp_obj_t mp_obj_new_ge25519_r(mp_obj_t r) {
+static mp_obj_t mp_obj_new_ge25519_r(mp_obj_t r) {
if (r == mp_const_none) {
return mp_obj_new_ge25519();
}
@@ -110,7 +110,7 @@ STATIC mp_obj_t mp_obj_new_ge25519_r(mp_obj_t r) {
return r;
}
-STATIC void mp_unpack_ge25519(ge25519 *r, const mp_obj_t arg, mp_int_t offset) {
+static void mp_unpack_ge25519(ge25519 *r, const mp_obj_t arg, mp_int_t offset) {
mp_buffer_info_t buff = {0};
mp_get_buffer_raise(arg, &buff, MP_BUFFER_READ);
if (buff.len < 32 + offset) {
@@ -123,7 +123,7 @@ STATIC void mp_unpack_ge25519(ge25519 *r, const mp_obj_t arg, mp_int_t offset) {
}
}
-STATIC void mp_unpack_scalar(bignum256modm r, const mp_obj_t arg,
+static void mp_unpack_scalar(bignum256modm r, const mp_obj_t arg,
mp_int_t offset) {
mp_buffer_info_t buff = {0};
mp_get_buffer_raise(arg, &buff, MP_BUFFER_READ);
@@ -147,7 +147,7 @@ STATIC void mp_unpack_scalar(bignum256modm r, const mp_obj_t arg,
/// Constructor
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_make_new(
+static mp_obj_t mod_trezorcrypto_monero_ge25519_make_new(
const mp_obj_type_t *type, size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -167,12 +167,12 @@ STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_make_new(
return MP_OBJ_FROM_PTR(o);
}
-STATIC mp_obj_t mod_trezorcrypto_monero_ge25519___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_monero_ge25519___del__(mp_obj_t self) {
mp_obj_ge25519_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->p), sizeof(ge25519));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_ge25519___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_ge25519___del___obj,
mod_trezorcrypto_monero_ge25519___del__);
/// class Scalar:
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_ge25519___del___obj,
/// Constructor
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_bignum256modm_make_new(
+static mp_obj_t mod_trezorcrypto_monero_bignum256modm_make_new(
const mp_obj_type_t *type, size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -209,12 +209,12 @@ STATIC mp_obj_t mod_trezorcrypto_monero_bignum256modm_make_new(
return MP_OBJ_FROM_PTR(o);
}
-STATIC mp_obj_t mod_trezorcrypto_monero_bignum256modm___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_monero_bignum256modm___del__(mp_obj_t self) {
mp_obj_bignum256modm_t *o = MP_OBJ_TO_PTR(self);
memzero(o->p, sizeof(bignum256modm));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_monero_bignum256modm___del___obj,
mod_trezorcrypto_monero_bignum256modm___del__);
@@ -230,7 +230,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(
/// """
/// Initializes a scalar
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_copy(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_sc_copy(const mp_obj_t dest,
const mp_obj_t src) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
@@ -246,54 +246,54 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_copy(const mp_obj_t dest,
}
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_copy_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_copy_obj,
mod_trezorcrypto_monero_sc_copy);
/// def sc_check(val: Scalar) -> None:
/// """
/// Throws exception if scalar is invalid
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_check(const mp_obj_t arg) {
+static mp_obj_t mod_trezorcrypto_monero_sc_check(const mp_obj_t arg) {
assert_scalar(arg);
if (check256_modm(MP_OBJ_C_SCALAR(arg)) != 1) {
mp_raise_ValueError(MP_ERROR_TEXT("Ed25519 scalar invalid"));
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_sc_check_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_sc_check_obj,
mod_trezorcrypto_monero_sc_check);
/// def sc_iszero(val: Scalar) -> bool:
/// """
/// Returns False if the scalar is zero
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_iszero(const mp_obj_t arg) {
+static mp_obj_t mod_trezorcrypto_monero_sc_iszero(const mp_obj_t arg) {
assert_scalar(arg);
const int r = iszero256_modm(MP_OBJ_C_SCALAR(arg));
return mp_obj_new_int(r);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_sc_iszero_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_sc_iszero_obj,
mod_trezorcrypto_monero_sc_iszero);
/// def sc_eq(a: Scalar, b: Scalar) -> int:
/// """
/// Compares scalars, returns 1 on the same value
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_eq(const mp_obj_t a,
+static mp_obj_t mod_trezorcrypto_monero_sc_eq(const mp_obj_t a,
const mp_obj_t b) {
assert_scalar(a);
assert_scalar(b);
int r = eq256_modm(MP_OBJ_C_SCALAR(a), MP_OBJ_C_SCALAR(b));
return MP_OBJ_NEW_SMALL_INT(r);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_eq_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_eq_obj,
mod_trezorcrypto_monero_sc_eq);
/// def sc_add_into(r: Scalar | None, a: Scalar, b: Scalar) -> Scalar:
/// """
/// Scalar addition
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_add_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_sc_add_into(const mp_obj_t dest,
const mp_obj_t a,
const mp_obj_t b) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
@@ -303,14 +303,14 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_add_into(const mp_obj_t dest,
add256_modm(MP_OBJ_SCALAR(res), MP_OBJ_C_SCALAR(a), MP_OBJ_C_SCALAR(b));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_add_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_add_into_obj,
mod_trezorcrypto_monero_sc_add_into);
/// def sc_sub_into(r: Scalar | None, a: Scalar, b: Scalar) -> Scalar:
/// """
/// Scalar subtraction
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_sub_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_sc_sub_into(const mp_obj_t dest,
const mp_obj_t a,
const mp_obj_t b) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
@@ -320,14 +320,14 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_sub_into(const mp_obj_t dest,
sub256_modm(MP_OBJ_SCALAR(res), MP_OBJ_C_SCALAR(a), MP_OBJ_C_SCALAR(b));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_sub_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_sub_into_obj,
mod_trezorcrypto_monero_sc_sub_into);
/// def sc_mul_into(r: Scalar | None, a: Scalar, b: Scalar) -> Scalar:
/// """
/// Scalar multiplication
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_mul_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_sc_mul_into(const mp_obj_t dest,
const mp_obj_t a,
const mp_obj_t b) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
@@ -337,7 +337,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_mul_into(const mp_obj_t dest,
mul256_modm(MP_OBJ_SCALAR(res), MP_OBJ_C_SCALAR(a), MP_OBJ_C_SCALAR(b));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_mul_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_mul_into_obj,
mod_trezorcrypto_monero_sc_mul_into);
/// def sc_mulsub_into(
@@ -346,7 +346,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_sc_mul_into_obj,
/// """
/// c - a*b
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_mulsub_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_sc_mulsub_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -358,7 +358,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_mulsub_into(size_t n_args,
MP_OBJ_C_SCALAR(args[2]), MP_OBJ_C_SCALAR(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_sc_mulsub_into_obj, 4, 4,
mod_trezorcrypto_monero_sc_mulsub_into);
@@ -368,7 +368,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// c + a*b
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_muladd_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_sc_muladd_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -380,7 +380,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_muladd_into(size_t n_args,
MP_OBJ_C_SCALAR(args[2]), MP_OBJ_C_SCALAR(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_sc_muladd_into_obj, 4, 4,
mod_trezorcrypto_monero_sc_muladd_into);
@@ -388,7 +388,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Scalar modular inversion
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_sc_inv_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_sc_inv_into(const mp_obj_t dest,
const mp_obj_t arg) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
assert_scalar(arg);
@@ -412,7 +412,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_sc_inv_into(const mp_obj_t dest,
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_inv_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_inv_into_obj,
mod_trezorcrypto_monero_sc_inv_into);
/// def encodeint_into(
@@ -421,7 +421,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_sc_inv_into_obj,
/// """
/// Scalar compression
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_encodeint_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_encodeint_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 3, false);
if (args[0] == mp_const_none) {
@@ -442,7 +442,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_encodeint_into(size_t n_args,
return args[0];
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_encodeint_into_obj, 2, 3,
mod_trezorcrypto_monero_encodeint_into);
@@ -452,7 +452,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Scalar decompression
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_decodeint_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_decodeint_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 3, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -460,7 +460,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_decodeint_into(size_t n_args,
mp_unpack_scalar(MP_OBJ_SCALAR(res), args[1], offset);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_decodeint_into_obj, 2, 3,
mod_trezorcrypto_monero_decodeint_into);
@@ -470,7 +470,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Scalar decompression, raw, without modular reduction
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_decodeint_into_noreduce(
+static mp_obj_t mod_trezorcrypto_monero_decodeint_into_noreduce(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 3, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -485,7 +485,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_decodeint_into_noreduce(
expand_raw256_modm(MP_OBJ_SCALAR(res), ((uint8_t *)buff.buf) + offset);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_decodeint_into_noreduce_obj, 2, 3,
mod_trezorcrypto_monero_decodeint_into_noreduce);
@@ -497,13 +497,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Sets neutral point
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_identity_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_identity_into(size_t n_args,
const mp_obj_t *args) {
mp_obj_t res = mp_obj_new_ge25519_r(n_args == 1 ? args[0] : mp_const_none);
ge25519_set_neutral(&MP_OBJ_GE25519(res));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_identity_into_obj, 0, 1,
mod_trezorcrypto_monero_identity_into);
@@ -511,48 +511,48 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Sets H point
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_H(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_xmr_H(size_t n_args,
const mp_obj_t *args) {
mp_obj_t res = mp_obj_new_ge25519_r(n_args == 1 ? args[0] : mp_const_none);
ge25519_set_xmr_h(&MP_OBJ_GE25519(res));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_monero_xmr_H_obj, 0,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_monero_xmr_H_obj, 0,
1, mod_trezorcrypto_monero_xmr_H);
/// def ge25519_check(r: Point) -> None:
/// """
/// Checks point, throws if not on curve
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_check(const mp_obj_t arg) {
+static mp_obj_t mod_trezorcrypto_monero_ge25519_check(const mp_obj_t arg) {
assert_ge25519(arg);
if (ge25519_check(&MP_OBJ_C_GE25519(arg)) != 1) {
mp_raise_ValueError(MP_ERROR_TEXT("Ed25519 point not on curve"));
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_ge25519_check_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_monero_ge25519_check_obj,
mod_trezorcrypto_monero_ge25519_check);
/// def point_eq(a: Point, b: Point) -> bool:
/// """
/// Compares EC points
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_point_eq(const mp_obj_t a,
+static mp_obj_t mod_trezorcrypto_monero_point_eq(const mp_obj_t a,
const mp_obj_t b) {
assert_ge25519(a);
assert_ge25519(b);
int r = ge25519_eq(&MP_OBJ_C_GE25519(a), &MP_OBJ_C_GE25519(b));
return MP_OBJ_NEW_SMALL_INT(r);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_point_eq_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_point_eq_obj,
mod_trezorcrypto_monero_point_eq);
/// def point_add_into(r: Point | None, a: Point, b: Point) -> Point:
/// """
/// Adds EC points
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_point_add_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_point_add_into(const mp_obj_t dest,
const mp_obj_t a,
const mp_obj_t b) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
@@ -563,14 +563,14 @@ STATIC mp_obj_t mod_trezorcrypto_monero_point_add_into(const mp_obj_t dest,
0);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_point_add_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_point_add_into_obj,
mod_trezorcrypto_monero_point_add_into);
/// def point_sub_into(r: Point | None, a: Point, b: Point) -> Point:
/// """
/// Subtracts EC points
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_point_sub_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_point_sub_into(const mp_obj_t dest,
const mp_obj_t a,
const mp_obj_t b) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
@@ -581,21 +581,21 @@ STATIC mp_obj_t mod_trezorcrypto_monero_point_sub_into(const mp_obj_t dest,
1);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_point_sub_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_point_sub_into_obj,
mod_trezorcrypto_monero_point_sub_into);
/// def ge25519_mul8(r: Point | None, p: Point) -> Point:
/// """
/// EC point * 8
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_mul8(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_ge25519_mul8(const mp_obj_t dest,
const mp_obj_t src) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
assert_ge25519(src);
ge25519_mul8(&MP_OBJ_GE25519(res), &MP_OBJ_C_GE25519(src));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_ge25519_mul8_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_ge25519_mul8_obj,
mod_trezorcrypto_monero_ge25519_mul8);
/// def ge25519_double_scalarmult_vartime_into(
@@ -604,7 +604,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_monero_ge25519_mul8_obj,
/// """
/// s1 * G + s2 * p1
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_double_scalarmult_vartime_into(
+static mp_obj_t mod_trezorcrypto_monero_ge25519_double_scalarmult_vartime_into(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -617,7 +617,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_ge25519_double_scalarmult_vartime_into(
MP_OBJ_C_SCALAR(args[2]), MP_OBJ_C_SCALAR(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_ge25519_double_scalarmult_vartime_into_obj, 4, 4,
mod_trezorcrypto_monero_ge25519_double_scalarmult_vartime_into);
@@ -627,7 +627,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// s * G
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_scalarmult_base_into(
+static mp_obj_t mod_trezorcrypto_monero_scalarmult_base_into(
const mp_obj_t dest, const mp_obj_t src) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
@@ -643,7 +643,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_scalarmult_base_into(
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(
+static MP_DEFINE_CONST_FUN_OBJ_2(
mod_trezorcrypto_monero_scalarmult_base_into_obj,
mod_trezorcrypto_monero_scalarmult_base_into);
@@ -653,7 +653,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(
/// """
/// s * p
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_scalarmult_into(const mp_obj_t dest,
+static mp_obj_t mod_trezorcrypto_monero_scalarmult_into(const mp_obj_t dest,
const mp_obj_t p,
const mp_obj_t s) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
@@ -672,7 +672,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_scalarmult_into(const mp_obj_t dest,
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_scalarmult_into_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_scalarmult_into_obj,
mod_trezorcrypto_monero_scalarmult_into);
/// def encodepoint_into(
@@ -681,7 +681,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_monero_scalarmult_into_obj,
/// """
/// Point compression
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_encodepoint_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_encodepoint_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 3, false);
if (args[0] == mp_const_none) {
@@ -702,7 +702,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_encodepoint_into(size_t n_args,
return args[0];
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_encodepoint_into_obj, 2, 3,
mod_trezorcrypto_monero_encodepoint_into);
@@ -712,7 +712,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Point decompression
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_decodepoint_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_decodepoint_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 3, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -720,7 +720,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_decodepoint_into(size_t n_args,
mp_unpack_ge25519(&MP_OBJ_GE25519(res), args[1], offset);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_decodepoint_into_obj, 2, 3,
mod_trezorcrypto_monero_decodepoint_into);
@@ -732,7 +732,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Monero block base 58 encoding
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_base58_addr_encode_check(
+static mp_obj_t mod_trezorcrypto_monero_xmr_base58_addr_encode_check(
const mp_obj_t tag, const mp_obj_t buff) {
vstr_t out = {0};
vstr_init_len(&out, 128);
@@ -749,7 +749,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_base58_addr_encode_check(
return mp_obj_new_str_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(
+static MP_DEFINE_CONST_FUN_OBJ_2(
mod_trezorcrypto_monero_xmr_base58_addr_encode_check_obj,
mod_trezorcrypto_monero_xmr_base58_addr_encode_check);
@@ -758,8 +758,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(
/// Monero block base 58 decoding, returning (decoded, tag) or raising on
/// error.
/// """
-STATIC mp_obj_t
-mod_trezorcrypto_monero_xmr_base58_addr_decode_check(const mp_obj_t buff) {
+static mp_obj_t mod_trezorcrypto_monero_xmr_base58_addr_decode_check(
+ const mp_obj_t buff) {
uint64_t tag = 0;
vstr_t out = {0};
vstr_init_len(&out, 128);
@@ -780,7 +780,7 @@ mod_trezorcrypto_monero_xmr_base58_addr_decode_check(const mp_obj_t buff) {
tuple->items[1] = mp_obj_new_int_from_ull(tag);
return MP_OBJ_FROM_PTR(tuple);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(
+static MP_DEFINE_CONST_FUN_OBJ_1(
mod_trezorcrypto_monero_xmr_base58_addr_decode_check_obj,
mod_trezorcrypto_monero_xmr_base58_addr_decode_check);
@@ -788,13 +788,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(
/// """
/// Generates a random scalar
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_random_scalar(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_random_scalar(size_t n_args,
const mp_obj_t *args) {
mp_obj_t res = mp_obj_new_scalar_r(n_args == 1 ? args[0] : mp_const_none);
xmr_random_scalar(MP_OBJ_SCALAR(res));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_random_scalar_obj, 0, 1,
mod_trezorcrypto_monero_random_scalar);
@@ -807,7 +807,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// XMR fast hash
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_fast_hash_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_fast_hash_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 4, false);
vstr_t out = {0};
@@ -837,7 +837,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_fast_hash_into(size_t n_args,
xmr_fast_hash(buff_use, (const char *)data.buf + offset, length);
return args[0] != mp_const_none ? args[0] : mp_obj_new_bytes_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_fast_hash_into_obj, 2, 4,
mod_trezorcrypto_monero_fast_hash_into);
@@ -850,7 +850,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// XMR hashing to EC point
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_hash_to_point_into(
+static mp_obj_t mod_trezorcrypto_monero_hash_to_point_into(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 4, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -867,7 +867,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_hash_to_point_into(
xmr_hash_to_ec(&MP_OBJ_GE25519(res), (const char *)data.buf + offset, length);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_hash_to_point_into_obj, 2, 4,
mod_trezorcrypto_monero_hash_to_point_into);
@@ -880,7 +880,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// XMR hashing to EC scalar
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_hash_to_scalar_into(
+static mp_obj_t mod_trezorcrypto_monero_hash_to_scalar_into(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 2, 4, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -897,7 +897,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_hash_to_scalar_into(
length);
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_hash_to_scalar_into_obj, 2, 4,
mod_trezorcrypto_monero_hash_to_scalar_into);
@@ -907,7 +907,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// H_s(derivation || varint(output_index))
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derivation_to_scalar(
+static mp_obj_t mod_trezorcrypto_monero_xmr_derivation_to_scalar(
const mp_obj_t dest, const mp_obj_t p, const mp_obj_t output_index) {
mp_obj_t res = mp_obj_new_scalar_r(dest);
assert_ge25519(p);
@@ -915,7 +915,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derivation_to_scalar(
mp_obj_get_int(output_index));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(
+static MP_DEFINE_CONST_FUN_OBJ_3(
mod_trezorcrypto_monero_xmr_derivation_to_scalar_obj,
mod_trezorcrypto_monero_xmr_derivation_to_scalar);
@@ -925,7 +925,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(
/// """
/// 8*(key2*key1)
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_generate_key_derivation(
+static mp_obj_t mod_trezorcrypto_monero_xmr_generate_key_derivation(
const mp_obj_t dest, const mp_obj_t A, const mp_obj_t b) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
assert_ge25519(A);
@@ -934,7 +934,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_generate_key_derivation(
MP_OBJ_C_SCALAR(b));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(
+static MP_DEFINE_CONST_FUN_OBJ_3(
mod_trezorcrypto_monero_xmr_generate_key_derivation_obj,
mod_trezorcrypto_monero_xmr_generate_key_derivation);
@@ -944,7 +944,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(
/// """
/// base + H_s(derivation || varint(output_index))
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derive_private_key(
+static mp_obj_t mod_trezorcrypto_monero_xmr_derive_private_key(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -954,7 +954,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derive_private_key(
mp_obj_get_int(args[2]), MP_OBJ_C_SCALAR(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_xmr_derive_private_key_obj, 4, 4,
mod_trezorcrypto_monero_xmr_derive_private_key);
@@ -964,7 +964,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// H_s(derivation || varint(output_index))G + base
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derive_public_key(
+static mp_obj_t mod_trezorcrypto_monero_xmr_derive_public_key(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -974,7 +974,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_derive_public_key(
mp_obj_get_int(args[2]), &MP_OBJ_C_GE25519(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_xmr_derive_public_key_obj, 4, 4,
mod_trezorcrypto_monero_xmr_derive_public_key);
@@ -984,7 +984,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// aG + bB, G is basepoint
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_add_keys2_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_add_keys2_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -995,7 +995,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_add_keys2_into(size_t n_args,
MP_OBJ_SCALAR(args[2]), &MP_OBJ_C_GE25519(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_add_keys2_into_obj, 4, 4,
mod_trezorcrypto_monero_add_keys2_into);
@@ -1005,7 +1005,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// aA + bB
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_add_keys3_into(size_t n_args,
+static mp_obj_t mod_trezorcrypto_monero_add_keys3_into(size_t n_args,
const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 5, 5, false);
mp_obj_t res = mp_obj_new_ge25519_r(args[0]);
@@ -1018,7 +1018,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_add_keys3_into(size_t n_args,
&MP_OBJ_C_GE25519(args[4]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_add_keys3_into_obj, 5, 5,
mod_trezorcrypto_monero_add_keys3_into);
@@ -1028,7 +1028,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Hs(SubAddr || a || index_major || index_minor)
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_xmr_get_subaddress_secret_key(
+static mp_obj_t mod_trezorcrypto_monero_xmr_get_subaddress_secret_key(
size_t n_args, const mp_obj_t *args) {
mp_arg_check_num(n_args, 0, 4, 4, false);
mp_obj_t res = mp_obj_new_scalar_r(args[0]);
@@ -1038,7 +1038,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_get_subaddress_secret_key(
MP_OBJ_C_SCALAR(args[3]));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_monero_xmr_get_subaddress_secret_key_obj, 4, 4,
mod_trezorcrypto_monero_xmr_get_subaddress_secret_key);
@@ -1046,7 +1046,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// aG + amount * H
/// """
-STATIC mp_obj_t mod_trezorcrypto_monero_gen_commitment_into(
+static mp_obj_t mod_trezorcrypto_monero_gen_commitment_into(
const mp_obj_t dest, const mp_obj_t a, const mp_obj_t amount) {
mp_obj_t res = mp_obj_new_ge25519_r(dest);
assert_scalar(a);
@@ -1054,7 +1054,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_gen_commitment_into(
trezor_obj_get_uint64(amount));
return res;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(
+static MP_DEFINE_CONST_FUN_OBJ_3(
mod_trezorcrypto_monero_gen_commitment_into_obj,
mod_trezorcrypto_monero_gen_commitment_into);
@@ -1062,7 +1062,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(
/// """
/// Constant time buffer comparison
/// """
-STATIC mp_obj_t mod_trezorcrypto_ct_equals(const mp_obj_t a, const mp_obj_t b) {
+static mp_obj_t mod_trezorcrypto_ct_equals(const mp_obj_t a, const mp_obj_t b) {
mp_buffer_info_t buff_a = {0}, buff_b = {0};
mp_get_buffer_raise(a, &buff_a, MP_BUFFER_READ);
mp_get_buffer_raise(b, &buff_b, MP_BUFFER_READ);
@@ -1074,46 +1074,46 @@ STATIC mp_obj_t mod_trezorcrypto_ct_equals(const mp_obj_t a, const mp_obj_t b) {
int r = consteq(buff_a.buf, buff_b.buf, buff_a.len);
return MP_OBJ_NEW_SMALL_INT(r);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ct_equals_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_ct_equals_obj,
mod_trezorcrypto_ct_equals);
//
// Type defs
//
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_monero_ge25519_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR___del__),
MP_ROM_PTR(&mod_trezorcrypto_monero_ge25519___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_monero_ge25519_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_monero_ge25519_locals_dict,
mod_trezorcrypto_monero_ge25519_locals_dict_table);
// clang-format off
-MP_DEFINE_CONST_OBJ_TYPE(mod_trezorcrypto_monero_ge25519_type,
+static MP_DEFINE_CONST_OBJ_TYPE(mod_trezorcrypto_monero_ge25519_type,
MP_QSTR_Point, MP_TYPE_FLAG_NONE,
make_new, mod_trezorcrypto_monero_ge25519_make_new,
locals_dict, &mod_trezorcrypto_monero_ge25519_locals_dict);
// clang-format on
-STATIC const mp_rom_map_elem_t
+static const mp_rom_map_elem_t
mod_trezorcrypto_monero_bignum256modm_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR___del__),
MP_ROM_PTR(&mod_trezorcrypto_monero_bignum256modm___del___obj)},
};
-STATIC MP_DEFINE_CONST_DICT(
+static MP_DEFINE_CONST_DICT(
mod_trezorcrypto_monero_bignum256modm_locals_dict,
mod_trezorcrypto_monero_bignum256modm_locals_dict_table);
// clang-format off
-MP_DEFINE_CONST_OBJ_TYPE(mod_trezorcrypto_monero_bignum256modm_type,
+static MP_DEFINE_CONST_OBJ_TYPE(mod_trezorcrypto_monero_bignum256modm_type,
MP_QSTR_Scalar, MP_TYPE_FLAG_NONE,
make_new, mod_trezorcrypto_monero_bignum256modm_make_new,
locals_dict, &mod_trezorcrypto_monero_bignum256modm_locals_dict);
// clang-format on
/// BP_GI_PLUS_PRE: bytes
-STATIC const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_GI_PRE_obj = {{&mp_type_bytes}, 0, 8192, (const byte*)""
+static const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_GI_PRE_obj = {{&mp_type_bytes}, 0, 8192, (const byte*)""
"\x38\xc5\xd4\xdb\x53\xae\xb8\x6f\x5a\x80\xde\xf9\xbe\x49\x53\xf2"
"\x28\x8e\xd5\xa4\x4c\x66\xaf\x72\x3f\x46\x3d\x01\x70\x82\x90\x10"
"\x8a\x6c\x81\x7d\xab\xe9\x0f\xdb\x50\xcc\x38\x67\x7b\x23\xff\xa7"
@@ -1629,7 +1629,7 @@ STATIC const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_GI_PRE_obj = {{&mp_typ
};
/// BP_HI_PLUS_PRE: bytes
-STATIC const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_HI_PRE_obj = {{&mp_type_bytes}, 0, 8192, (const byte*)""
+static const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_HI_PRE_obj = {{&mp_type_bytes}, 0, 8192, (const byte*)""
"\x48\x62\x8d\xf3\x80\xa5\x01\x6d\x25\x45\x1a\xaa\x50\x17\x31\xa1"
"\x1b\x72\xbf\x66\xdc\x41\xd8\x1f\x71\x9a\xbd\x35\xce\x92\xb0\xed"
"\x11\x0d\x2b\x61\xf8\xc7\xc1\x08\x61\xc3\xe4\xff\xe7\x77\x4f\xab"
@@ -2144,7 +2144,7 @@ STATIC const mp_obj_str_t mod_trezorcrypto_monero_BP_PLUS_HI_PRE_obj = {{&mp_typ
"\xd3\x3a\xb9\xb1\x12\x23\xee\x67\xea\x78\xb1\xd3\x8a\x6a\xe3\xeb"
};
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_monero_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_monero_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_monero)},
// types
{MP_ROM_QSTR(MP_QSTR_Point),
@@ -2239,10 +2239,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_monero_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_BP_PLUS_HI_PRE),
MP_ROM_PTR(&mod_trezorcrypto_monero_BP_PLUS_HI_PRE_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_monero_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_monero_globals,
mod_trezorcrypto_monero_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_monero_module = {
+static const mp_obj_module_t mod_trezorcrypto_monero_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_monero_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nem.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nem.h
index 7e7c4265..db4642b8 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nem.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nem.h
@@ -29,7 +29,7 @@
/// """
/// Validate a NEM address
/// """
-STATIC mp_obj_t mod_trezorcrypto_nem_validate_address(mp_obj_t address,
+static mp_obj_t mod_trezorcrypto_nem_validate_address(mp_obj_t address,
mp_obj_t network) {
mp_buffer_info_t addr = {0};
mp_get_buffer_raise(address, &addr, MP_BUFFER_READ);
@@ -37,14 +37,14 @@ STATIC mp_obj_t mod_trezorcrypto_nem_validate_address(mp_obj_t address,
uint32_t n = trezor_obj_get_uint(network);
return mp_obj_new_bool(nem_validate_address(addr.buf, n));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nem_validate_address_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nem_validate_address_obj,
mod_trezorcrypto_nem_validate_address);
/// def compute_address(public_key: AnyBytes, network: int) -> str:
/// """
/// Compute a NEM address from a public key
/// """
-STATIC mp_obj_t mod_trezorcrypto_nem_compute_address(mp_obj_t public_key,
+static mp_obj_t mod_trezorcrypto_nem_compute_address(mp_obj_t public_key,
mp_obj_t network) {
mp_buffer_info_t p = {0};
mp_get_buffer_raise(public_key, &p, MP_BUFFER_READ);
@@ -58,21 +58,21 @@ STATIC mp_obj_t mod_trezorcrypto_nem_compute_address(mp_obj_t public_key,
}
return mp_obj_new_str_from_cstr(address);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nem_compute_address_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nem_compute_address_obj,
mod_trezorcrypto_nem_compute_address);
// objects definition
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_nem_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_nem_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_validate_address),
MP_ROM_PTR(&mod_trezorcrypto_nem_validate_address_obj)},
{MP_ROM_QSTR(MP_QSTR_compute_address),
MP_ROM_PTR(&mod_trezorcrypto_nem_compute_address_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_nem_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_nem_globals,
mod_trezorcrypto_nem_globals_table);
// module definition
-STATIC const mp_obj_module_t mod_trezorcrypto_nem_module = {
+static const mp_obj_module_t mod_trezorcrypto_nem_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_nem_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nist256p1.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
index 7b35cd24..5c47ba8d 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
@@ -30,7 +30,7 @@
/// """
/// Generate secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_generate_secret() {
+static mp_obj_t mod_trezorcrypto_nist256p1_generate_secret() {
vstr_t sk = {0};
vstr_init_len(&sk, 32);
for (;;) {
@@ -54,14 +54,14 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_generate_secret() {
}
return mp_obj_new_bytes_from_vstr(&sk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_nist256p1_generate_secret_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_nist256p1_generate_secret_obj,
mod_trezorcrypto_nist256p1_generate_secret);
/// def publickey(secret_key: AnyBytes, compressed: bool = True) -> bytes:
/// """
/// Computes public key from secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_publickey(size_t n_args,
+static mp_obj_t mod_trezorcrypto_nist256p1_publickey(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
@@ -85,7 +85,7 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_publickey(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_nist256p1_publickey_obj, 1, 2,
mod_trezorcrypto_nist256p1_publickey);
@@ -95,7 +95,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
/// """
/// Uses secret key to produce the signature of the digest.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_sign(size_t n_args,
+static mp_obj_t mod_trezorcrypto_nist256p1_sign(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0};
mp_buffer_info_t dig = {0};
@@ -120,7 +120,7 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_sign(size_t n_args,
sig.buf[0] = 27 + pby + compressed * 4;
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_nist256p1_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_nist256p1_sign_obj,
2, 3,
mod_trezorcrypto_nist256p1_sign);
@@ -131,7 +131,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_nist256p1_sign_obj,
/// Uses public key to verify the signature of the digest.
/// Returns True on success.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_verify(mp_obj_t public_key,
+static mp_obj_t mod_trezorcrypto_nist256p1_verify(mp_obj_t public_key,
mp_obj_t signature,
mp_obj_t digest) {
mp_buffer_info_t pk = {0}, sig = {0}, dig = {0};
@@ -153,7 +153,7 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_verify(mp_obj_t public_key,
(const uint8_t *)sig.buf + offset,
(const uint8_t *)dig.buf));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_nist256p1_verify_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_nist256p1_verify_obj,
mod_trezorcrypto_nist256p1_verify);
/// def verify_recover(signature: AnyBytes, digest: AnyBytes) -> bytes:
@@ -161,7 +161,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_nist256p1_verify_obj,
/// Uses signature of the digest to verify the digest and recover the public
/// key. Returns public key on success, None if the signature is invalid.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_verify_recover(mp_obj_t signature,
+static mp_obj_t mod_trezorcrypto_nist256p1_verify_recover(mp_obj_t signature,
mp_obj_t digest) {
mp_buffer_info_t sig = {0}, dig = {0};
mp_get_buffer_raise(signature, &sig, MP_BUFFER_READ);
@@ -192,7 +192,7 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_verify_recover(mp_obj_t signature,
return mp_const_none;
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nist256p1_verify_recover_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nist256p1_verify_recover_obj,
mod_trezorcrypto_nist256p1_verify_recover);
/// def multiply(secret_key: AnyBytes, public_key: AnyBytes) -> bytes:
@@ -200,7 +200,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nist256p1_verify_recover_obj,
/// Multiplies point defined by public_key with scalar defined by
/// secret_key. Useful for ECDH.
/// """
-STATIC mp_obj_t mod_trezorcrypto_nist256p1_multiply(mp_obj_t secret_key,
+static mp_obj_t mod_trezorcrypto_nist256p1_multiply(mp_obj_t secret_key,
mp_obj_t public_key) {
mp_buffer_info_t sk = {0}, pk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
@@ -220,10 +220,10 @@ STATIC mp_obj_t mod_trezorcrypto_nist256p1_multiply(mp_obj_t secret_key,
}
return mp_obj_new_bytes_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nist256p1_multiply_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_nist256p1_multiply_obj,
mod_trezorcrypto_nist256p1_multiply);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_nist256p1_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_nist256p1_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nist256p1)},
{MP_ROM_QSTR(MP_QSTR_generate_secret),
MP_ROM_PTR(&mod_trezorcrypto_nist256p1_generate_secret_obj)},
@@ -238,10 +238,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_nist256p1_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_multiply),
MP_ROM_PTR(&mod_trezorcrypto_nist256p1_multiply_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_nist256p1_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_nist256p1_globals,
mod_trezorcrypto_nist256p1_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_nist256p1_module = {
+static const mp_obj_module_t mod_trezorcrypto_nist256p1_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_nist256p1_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-optiga.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-optiga.h
index 6ac4c4cc..f7b1515a 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-optiga.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-optiga.h
@@ -40,7 +40,7 @@ MP_DEFINE_EXCEPTION(SigningInaccessible, OptigaError)
/// """
/// Return the certificate stored at the given index.
/// """
-STATIC mp_obj_t mod_trezorcrypto_optiga_get_certificate(mp_obj_t cert_index) {
+static mp_obj_t mod_trezorcrypto_optiga_get_certificate(mp_obj_t cert_index) {
mp_int_t idx = mp_obj_get_int(cert_index);
if (idx < 0 || idx >= OPTIGA_CERT_COUNT) {
mp_raise_ValueError(MP_ERROR_TEXT("Invalid index."));
@@ -63,7 +63,7 @@ STATIC mp_obj_t mod_trezorcrypto_optiga_get_certificate(mp_obj_t cert_index) {
cert.len = cert_size;
return mp_obj_new_bytes_from_vstr(&cert);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_optiga_get_certificate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_optiga_get_certificate_obj,
mod_trezorcrypto_optiga_get_certificate);
/// def sign(
@@ -74,7 +74,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_optiga_get_certificate_obj,
/// Uses the private key at key_index to produce a DER-encoded signature of
/// the digest.
/// """
-STATIC mp_obj_t mod_trezorcrypto_optiga_sign(mp_obj_t key_index,
+static mp_obj_t mod_trezorcrypto_optiga_sign(mp_obj_t key_index,
mp_obj_t digest) {
mp_int_t idx = mp_obj_get_int(key_index);
if (idx < 0 || idx >= OPTIGA_ECC_KEY_COUNT) {
@@ -106,21 +106,21 @@ STATIC mp_obj_t mod_trezorcrypto_optiga_sign(mp_obj_t key_index,
sig.len = sig_size;
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_optiga_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_optiga_sign_obj,
mod_trezorcrypto_optiga_sign);
/// def get_sec() -> int | None:
/// """
/// Returns the value of Optiga's security event counter.
/// """
-STATIC mp_obj_t mod_trezorcrypto_optiga_get_sec() {
+static mp_obj_t mod_trezorcrypto_optiga_get_sec() {
uint8_t sec = 0;
if (optiga_read_sec(&sec)) {
return mp_obj_new_int_from_uint(sec);
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_optiga_get_sec_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_optiga_get_sec_obj,
mod_trezorcrypto_optiga_get_sec);
#if USE_OPTIGA_TESTING
@@ -128,18 +128,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_optiga_get_sec_obj,
/// """
/// Set Optiga's security event counter to maximum.
/// """
-STATIC mp_obj_t mod_trezorcrypto_optiga_set_sec_max() {
+static mp_obj_t mod_trezorcrypto_optiga_set_sec_max() {
optiga_set_sec_max();
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_optiga_set_sec_max_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_optiga_set_sec_max_obj,
mod_trezorcrypto_optiga_set_sec_max);
#endif
/// DEVICE_CERT_INDEX: int
/// DEVICE_ECC_KEY_INDEX: int
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_optiga_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_optiga_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_optiga)},
{MP_ROM_QSTR(MP_QSTR_get_certificate),
MP_ROM_PTR(&mod_trezorcrypto_optiga_get_certificate_obj)},
@@ -157,10 +157,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_optiga_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_OptigaError), MP_ROM_PTR(&mp_type_OptigaError)},
{MP_ROM_QSTR(MP_QSTR_SigningInaccessible),
MP_ROM_PTR(&mp_type_SigningInaccessible)}};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_optiga_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_optiga_globals,
mod_trezorcrypto_optiga_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_optiga_module = {
+static const mp_obj_module_t mod_trezorcrypto_optiga_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_optiga_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
index 66edc5e2..342fbde7 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
@@ -42,7 +42,7 @@ typedef struct _mp_obj_Pbkdf2_t {
uint32_t prf;
} mp_obj_Pbkdf2_t;
-STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -55,7 +55,7 @@ STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self, mp_obj_t data);
/// """
/// Create a PBKDF2 context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Pbkdf2_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 3, 4, false);
@@ -101,7 +101,7 @@ STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_make_new(const mp_obj_type_t *type,
/// """
/// Update a PBKDF2 context.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self,
mp_obj_t iterations) {
mp_obj_Pbkdf2_t *o = MP_OBJ_TO_PTR(self);
uint32_t iter = trezor_obj_get_uint(iterations);
@@ -115,14 +115,14 @@ STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_update(mp_obj_t self,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Pbkdf2_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Pbkdf2_update_obj,
mod_trezorcrypto_Pbkdf2_update);
/// def key(self) -> bytes:
/// """
/// Retrieve derived key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_key(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Pbkdf2_key(mp_obj_t self) {
mp_obj_Pbkdf2_t *o = MP_OBJ_TO_PTR(self);
vstr_t out = {0};
if (o->prf == PRF_HMAC_SHA256) {
@@ -142,19 +142,19 @@ STATIC mp_obj_t mod_trezorcrypto_Pbkdf2_key(mp_obj_t self) {
}
return mp_obj_new_bytes_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Pbkdf2_key_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Pbkdf2_key_obj,
mod_trezorcrypto_Pbkdf2_key);
-STATIC mp_obj_t mod_trezorcrypto_Pbkdf2___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Pbkdf2___del__(mp_obj_t self) {
mp_obj_Pbkdf2_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx256), sizeof(PBKDF2_HMAC_SHA256_CTX));
memzero(&(o->ctx512), sizeof(PBKDF2_HMAC_SHA512_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Pbkdf2___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Pbkdf2___del___obj,
mod_trezorcrypto_Pbkdf2___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Pbkdf2_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Pbkdf2_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Pbkdf2_update_obj)},
{MP_ROM_QSTR(MP_QSTR_key), MP_ROM_PTR(&mod_trezorcrypto_Pbkdf2_key_obj)},
@@ -163,7 +163,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Pbkdf2_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_HMAC_SHA256), MP_ROM_INT(PRF_HMAC_SHA256)},
{MP_ROM_QSTR(MP_QSTR_HMAC_SHA512), MP_ROM_INT(PRF_HMAC_SHA512)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Pbkdf2_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Pbkdf2_locals_dict,
mod_trezorcrypto_Pbkdf2_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-random.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-random.h
index 0be7d55a..289e9a47 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-random.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-random.h
@@ -30,14 +30,14 @@
/// """
/// Compute uniform random number from interval 0 ... n - 1.
/// """
-STATIC mp_obj_t mod_trezorcrypto_random_uniform(mp_obj_t n) {
+static mp_obj_t mod_trezorcrypto_random_uniform(mp_obj_t n) {
uint32_t nn = trezor_obj_get_uint(n);
if (nn == 0) {
mp_raise_ValueError(MP_ERROR_TEXT("Maximum can't be zero"));
}
return mp_obj_new_int_from_uint(random_uniform(nn));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_uniform_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_uniform_obj,
mod_trezorcrypto_random_uniform);
/// import builtins
@@ -46,7 +46,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_uniform_obj,
/// Generate random bytes sequence of length len. If `strong` is set then
/// maximum sources of entropy are used.
/// """
-STATIC mp_obj_t mod_trezorcrypto_random_bytes(size_t n_args,
+static mp_obj_t mod_trezorcrypto_random_bytes(size_t n_args,
const mp_obj_t *args) {
uint32_t len = trezor_obj_get_uint(args[0]);
if (len > 1024) {
@@ -65,14 +65,14 @@ STATIC mp_obj_t mod_trezorcrypto_random_bytes(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_random_bytes_obj, 1,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_random_bytes_obj, 1,
2, mod_trezorcrypto_random_bytes);
/// def shuffle(data: list) -> None:
/// """
/// Shuffles items of given list (in-place).
/// """
-STATIC mp_obj_t mod_trezorcrypto_random_shuffle(mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_random_shuffle(mp_obj_t data) {
size_t count = 0;
mp_obj_t *items = NULL;
mp_obj_get_array(data, &count, &items);
@@ -92,7 +92,7 @@ STATIC mp_obj_t mod_trezorcrypto_random_shuffle(mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_shuffle_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_shuffle_obj,
mod_trezorcrypto_random_shuffle);
#ifdef TREZOR_EMULATOR
@@ -100,15 +100,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_shuffle_obj,
/// """
/// Re-seed the RNG with given value.
/// """
-STATIC mp_obj_t mod_trezorcrypto_random_reseed(mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_random_reseed(mp_obj_t data) {
random_reseed(trezor_obj_get_uint(data));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_reseed_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_random_reseed_obj,
mod_trezorcrypto_random_reseed);
#endif
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_random_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_random_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random)},
{MP_ROM_QSTR(MP_QSTR_uniform),
MP_ROM_PTR(&mod_trezorcrypto_random_uniform_obj)},
@@ -121,10 +121,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_random_globals_table[] = {
MP_ROM_PTR(&mod_trezorcrypto_random_reseed_obj)},
#endif
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_random_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_random_globals,
mod_trezorcrypto_random_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_random_module = {
+static const mp_obj_module_t mod_trezorcrypto_random_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_random_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ripemd160.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
index 57d8d030..b48c50cb 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
@@ -35,13 +35,13 @@ typedef struct _mp_obj_Ripemd160_t {
ripemd160_state ctx;
} mp_obj_Ripemd160_t;
-STATIC mp_obj_t mod_trezorcrypto_Ripemd160_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Ripemd160_update(mp_obj_t self, mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Ripemd160_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Ripemd160_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -59,7 +59,7 @@ STATIC mp_obj_t mod_trezorcrypto_Ripemd160_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Ripemd160_update(mp_obj_t self,
+static mp_obj_t mod_trezorcrypto_Ripemd160_update(mp_obj_t self,
mp_obj_t data) {
mp_obj_Ripemd160_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
@@ -69,14 +69,14 @@ STATIC mp_obj_t mod_trezorcrypto_Ripemd160_update(mp_obj_t self,
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Ripemd160_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Ripemd160_update_obj,
mod_trezorcrypto_Ripemd160_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Ripemd160_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Ripemd160_digest(mp_obj_t self) {
mp_obj_Ripemd160_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, RIPEMD160_DIGEST_LENGTH);
@@ -86,19 +86,19 @@ STATIC mp_obj_t mod_trezorcrypto_Ripemd160_digest(mp_obj_t self) {
memzero(&ctx, sizeof(ripemd160_state));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Ripemd160_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Ripemd160_digest_obj,
mod_trezorcrypto_Ripemd160_digest);
-STATIC mp_obj_t mod_trezorcrypto_Ripemd160___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Ripemd160___del__(mp_obj_t self) {
mp_obj_Ripemd160_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(ripemd160_state));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Ripemd160___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Ripemd160___del___obj,
mod_trezorcrypto_Ripemd160___del__);
-STATIC const mp_rom_map_elem_t
- mod_trezorcrypto_Ripemd160_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Ripemd160_locals_dict_table[] =
+ {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Ripemd160_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -108,7 +108,7 @@ STATIC const mp_rom_map_elem_t
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(RIPEMD160_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(RIPEMD160_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Ripemd160_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Ripemd160_locals_dict,
mod_trezorcrypto_Ripemd160_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-secp256k1.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
index a24ecc96..e60d339b 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
@@ -30,7 +30,7 @@
/// """
/// Generate secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_generate_secret() {
+static mp_obj_t mod_trezorcrypto_secp256k1_generate_secret() {
vstr_t sk = {0};
vstr_init_len(&sk, 32);
for (;;) {
@@ -54,14 +54,14 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_generate_secret() {
}
return mp_obj_new_bytes_from_vstr(&sk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_secp256k1_generate_secret_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorcrypto_secp256k1_generate_secret_obj,
mod_trezorcrypto_secp256k1_generate_secret);
/// def publickey(secret_key: AnyBytes, compressed: bool = True) -> bytes:
/// """
/// Computes public key from secret key.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_publickey(size_t n_args,
+static mp_obj_t mod_trezorcrypto_secp256k1_publickey(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0};
mp_get_buffer_raise(args[0], &sk, MP_BUFFER_READ);
@@ -86,7 +86,7 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_publickey(size_t n_args,
}
return mp_obj_new_bytes_from_vstr(&pk);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(
mod_trezorcrypto_secp256k1_publickey_obj, 1, 2,
mod_trezorcrypto_secp256k1_publickey);
@@ -125,7 +125,7 @@ enum {
/// """
/// Uses secret key to produce the signature of the digest.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_sign(size_t n_args,
+static mp_obj_t mod_trezorcrypto_secp256k1_sign(size_t n_args,
const mp_obj_t *args) {
mp_buffer_info_t sk = {0};
mp_buffer_info_t dig = {0};
@@ -162,7 +162,7 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_sign(size_t n_args,
sig.buf[0] = 27 + pby + compressed * 4;
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_sign_obj,
2, 4,
mod_trezorcrypto_secp256k1_sign);
@@ -173,7 +173,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_secp256k1_sign_obj,
/// Uses public key to verify the signature of the digest.
/// Returns True on success.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_verify(mp_obj_t public_key,
+static mp_obj_t mod_trezorcrypto_secp256k1_verify(mp_obj_t public_key,
mp_obj_t signature,
mp_obj_t digest) {
mp_buffer_info_t pk = {0}, sig = {0}, dig = {0};
@@ -195,7 +195,7 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_verify(mp_obj_t public_key,
(const uint8_t *)dig.buf);
return mp_obj_new_bool(ret == 0);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_secp256k1_verify_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_secp256k1_verify_obj,
mod_trezorcrypto_secp256k1_verify);
/// def verify_recover(signature: AnyBytes, digest: AnyBytes) -> bytes:
@@ -203,7 +203,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorcrypto_secp256k1_verify_obj,
/// Uses signature of the digest to verify the digest and recover the public
/// key. Returns public key on success, None if the signature is invalid.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_verify_recover(mp_obj_t signature,
+static mp_obj_t mod_trezorcrypto_secp256k1_verify_recover(mp_obj_t signature,
mp_obj_t digest) {
mp_buffer_info_t sig = {0}, dig = {0};
mp_get_buffer_raise(signature, &sig, MP_BUFFER_READ);
@@ -234,7 +234,7 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_verify_recover(mp_obj_t signature,
return mp_const_none;
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_secp256k1_verify_recover_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_secp256k1_verify_recover_obj,
mod_trezorcrypto_secp256k1_verify_recover);
/// def multiply(secret_key: AnyBytes, public_key: AnyBytes) -> bytes:
@@ -242,7 +242,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_secp256k1_verify_recover_obj,
/// Multiplies point defined by public_key with scalar defined by
/// secret_key. Useful for ECDH.
/// """
-STATIC mp_obj_t mod_trezorcrypto_secp256k1_multiply(mp_obj_t secret_key,
+static mp_obj_t mod_trezorcrypto_secp256k1_multiply(mp_obj_t secret_key,
mp_obj_t public_key) {
mp_buffer_info_t sk = {0}, pk = {0};
mp_get_buffer_raise(secret_key, &sk, MP_BUFFER_READ);
@@ -262,10 +262,10 @@ STATIC mp_obj_t mod_trezorcrypto_secp256k1_multiply(mp_obj_t secret_key,
}
return mp_obj_new_bytes_from_vstr(&out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_secp256k1_multiply_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_secp256k1_multiply_obj,
mod_trezorcrypto_secp256k1_multiply);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_secp256k1_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_secp256k1_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_secp256k1)},
{MP_ROM_QSTR(MP_QSTR_generate_secret),
MP_ROM_PTR(&mod_trezorcrypto_secp256k1_generate_secret_obj)},
@@ -285,10 +285,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_secp256k1_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_CANONICAL_SIG_EOS), MP_ROM_INT(CANONICAL_SIG_EOS)},
#endif
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_secp256k1_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_secp256k1_globals,
mod_trezorcrypto_secp256k1_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_secp256k1_module = {
+static const mp_obj_module_t mod_trezorcrypto_secp256k1_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_secp256k1_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha1.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha1.h
index 017586aa..c3104d80 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha1.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha1.h
@@ -35,13 +35,13 @@ typedef struct _mp_obj_Sha1_t {
SHA1_CTX ctx;
} mp_obj_Sha1_t;
-STATIC mp_obj_t mod_trezorcrypto_Sha1_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Sha1_update(mp_obj_t self, mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha1_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Sha1_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -58,7 +58,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha1_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha1_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Sha1_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Sha1_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -67,14 +67,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha1_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha1_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha1_update_obj,
mod_trezorcrypto_Sha1_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha1_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha1_digest(mp_obj_t self) {
mp_obj_Sha1_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, SHA1_DIGEST_LENGTH);
@@ -84,18 +84,18 @@ STATIC mp_obj_t mod_trezorcrypto_Sha1_digest(mp_obj_t self) {
memzero(&ctx, sizeof(SHA1_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha1_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha1_digest_obj,
mod_trezorcrypto_Sha1_digest);
-STATIC mp_obj_t mod_trezorcrypto_Sha1___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha1___del__(mp_obj_t self) {
mp_obj_Sha1_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(SHA1_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha1___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha1___del___obj,
mod_trezorcrypto_Sha1___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha1_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Sha1_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Sha1_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -105,7 +105,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha1_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(SHA1_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(SHA1_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha1_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha1_locals_dict,
mod_trezorcrypto_Sha1_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha256.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha256.h
index 5bbdf5ca..62e673f9 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha256.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha256.h
@@ -35,13 +35,13 @@ typedef struct _mp_obj_Sha256_t {
SHA256_CTX ctx;
} mp_obj_Sha256_t;
-STATIC mp_obj_t mod_trezorcrypto_Sha256_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Sha256_update(mp_obj_t self, mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha256_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Sha256_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -58,7 +58,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha256_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha256_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Sha256_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Sha256_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -67,14 +67,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha256_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha256_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha256_update_obj,
mod_trezorcrypto_Sha256_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha256_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha256_digest(mp_obj_t self) {
mp_obj_Sha256_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, SHA256_DIGEST_LENGTH);
@@ -84,18 +84,18 @@ STATIC mp_obj_t mod_trezorcrypto_Sha256_digest(mp_obj_t self) {
memzero(&ctx, sizeof(SHA256_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha256_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha256_digest_obj,
mod_trezorcrypto_Sha256_digest);
-STATIC mp_obj_t mod_trezorcrypto_Sha256___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha256___del__(mp_obj_t self) {
mp_obj_Sha256_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(SHA256_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha256___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha256___del___obj,
mod_trezorcrypto_Sha256___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha256_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Sha256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Sha256_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -105,7 +105,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(SHA256_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(SHA256_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha256_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha256_locals_dict,
mod_trezorcrypto_Sha256_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-256.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
index 08b21fcc..bb43a593 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
@@ -36,7 +36,7 @@ typedef struct _mp_obj_Sha3_256_t {
bool keccak;
} mp_obj_Sha3_256_t;
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -46,11 +46,11 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data);
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Sha3_256_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, true);
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_data, MP_ARG_OBJ, {.u_obj = mp_const_none}},
{MP_QSTR_keccak, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL}},
};
@@ -75,7 +75,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Sha3_256_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -84,14 +84,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha3_256_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha3_256_update_obj,
mod_trezorcrypto_Sha3_256_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha3_256_digest(mp_obj_t self) {
mp_obj_Sha3_256_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, SHA3_256_DIGEST_LENGTH);
@@ -105,14 +105,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_digest(mp_obj_t self) {
memzero(&ctx, sizeof(SHA3_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_256_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_256_digest_obj,
mod_trezorcrypto_Sha3_256_digest);
/// def copy(self) -> sha3_256:
/// """
/// Returns the copy of the digest object with the current state
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256_copy(size_t n_args,
+static mp_obj_t mod_trezorcrypto_Sha3_256_copy(size_t n_args,
const mp_obj_t *args) {
mp_obj_Sha3_256_t *o = MP_OBJ_TO_PTR(args[0]);
mp_obj_Sha3_256_t *out =
@@ -121,19 +121,19 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_256_copy(size_t n_args,
memcpy(&(out->ctx), &(o->ctx), sizeof(SHA3_CTX));
return MP_OBJ_FROM_PTR(out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_Sha3_256_copy_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_Sha3_256_copy_obj,
1, 1,
mod_trezorcrypto_Sha3_256_copy);
-STATIC mp_obj_t mod_trezorcrypto_Sha3_256___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha3_256___del__(mp_obj_t self) {
mp_obj_Sha3_256_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(SHA3_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_256___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_256___del___obj,
mod_trezorcrypto_Sha3_256___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha3_256_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Sha3_256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Sha3_256_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -145,7 +145,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha3_256_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(SHA3_256_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(SHA3_256_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha3_256_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha3_256_locals_dict,
mod_trezorcrypto_Sha3_256_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-512.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
index f07c282e..42a40461 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
@@ -36,7 +36,7 @@ typedef struct _mp_obj_Sha3_512_t {
bool keccak;
} mp_obj_Sha3_512_t;
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data);
/// def __init__(
/// self,
@@ -46,11 +46,11 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data);
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Sha3_512_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, true);
- STATIC const mp_arg_t allowed_args[] = {
+ static const mp_arg_t allowed_args[] = {
{MP_QSTR_data, MP_ARG_OBJ, {.u_obj = mp_const_none}},
{MP_QSTR_keccak, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL}},
};
@@ -75,7 +75,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Sha3_512_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -84,14 +84,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha3_512_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha3_512_update_obj,
mod_trezorcrypto_Sha3_512_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha3_512_digest(mp_obj_t self) {
mp_obj_Sha3_512_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, SHA3_512_DIGEST_LENGTH);
@@ -105,14 +105,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_digest(mp_obj_t self) {
memzero(&ctx, sizeof(SHA3_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_512_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_512_digest_obj,
mod_trezorcrypto_Sha3_512_digest);
/// def copy(self) -> sha3_512:
/// """
/// Returns the copy of the digest object with the current state
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512_copy(size_t n_args,
+static mp_obj_t mod_trezorcrypto_Sha3_512_copy(size_t n_args,
const mp_obj_t *args) {
mp_obj_Sha3_512_t *o = MP_OBJ_TO_PTR(args[0]);
mp_obj_Sha3_512_t *out =
@@ -121,19 +121,19 @@ STATIC mp_obj_t mod_trezorcrypto_Sha3_512_copy(size_t n_args,
memcpy(&(out->ctx), &(o->ctx), sizeof(SHA3_CTX));
return MP_OBJ_FROM_PTR(out);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_Sha3_512_copy_obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorcrypto_Sha3_512_copy_obj,
1, 1,
mod_trezorcrypto_Sha3_512_copy);
-STATIC mp_obj_t mod_trezorcrypto_Sha3_512___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha3_512___del__(mp_obj_t self) {
mp_obj_Sha3_512_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(SHA3_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_512___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha3_512___del___obj,
mod_trezorcrypto_Sha3_512___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha3_512_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Sha3_512_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Sha3_512_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -145,7 +145,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha3_512_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(SHA3_512_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(SHA3_512_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha3_512_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha3_512_locals_dict,
mod_trezorcrypto_Sha3_512_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha512.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha512.h
index b904ff05..173752cb 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha512.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-sha512.h
@@ -35,13 +35,13 @@ typedef struct _mp_obj_Sha512_t {
SHA512_CTX ctx;
} mp_obj_Sha512_t;
-STATIC mp_obj_t mod_trezorcrypto_Sha512_update(mp_obj_t self, mp_obj_t data);
+static mp_obj_t mod_trezorcrypto_Sha512_update(mp_obj_t self, mp_obj_t data);
/// def __init__(self, __data: StrOrBytes | None = None) -> None:
/// """
/// Creates a hash context object.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha512_make_new(const mp_obj_type_t *type,
+static mp_obj_t mod_trezorcrypto_Sha512_make_new(const mp_obj_type_t *type,
size_t n_args, size_t n_kw,
const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -57,7 +57,7 @@ STATIC mp_obj_t mod_trezorcrypto_Sha512_make_new(const mp_obj_type_t *type,
/// """
/// Update the hash context with hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha512_update(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorcrypto_Sha512_update(mp_obj_t self, mp_obj_t data) {
mp_obj_Sha512_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t msg = {0};
mp_get_buffer_raise(data, &msg, MP_BUFFER_READ);
@@ -66,14 +66,14 @@ STATIC mp_obj_t mod_trezorcrypto_Sha512_update(mp_obj_t self, mp_obj_t data) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha512_update_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_Sha512_update_obj,
mod_trezorcrypto_Sha512_update);
/// def digest(self) -> bytes:
/// """
/// Returns the digest of hashed data.
/// """
-STATIC mp_obj_t mod_trezorcrypto_Sha512_digest(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha512_digest(mp_obj_t self) {
mp_obj_Sha512_t *o = MP_OBJ_TO_PTR(self);
vstr_t hash = {0};
vstr_init_len(&hash, SHA512_DIGEST_LENGTH);
@@ -83,18 +83,18 @@ STATIC mp_obj_t mod_trezorcrypto_Sha512_digest(mp_obj_t self) {
memzero(&ctx, sizeof(SHA512_CTX));
return mp_obj_new_bytes_from_vstr(&hash);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha512_digest_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha512_digest_obj,
mod_trezorcrypto_Sha512_digest);
-STATIC mp_obj_t mod_trezorcrypto_Sha512___del__(mp_obj_t self) {
+static mp_obj_t mod_trezorcrypto_Sha512___del__(mp_obj_t self) {
mp_obj_Sha512_t *o = MP_OBJ_TO_PTR(self);
memzero(&(o->ctx), sizeof(SHA512_CTX));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha512___del___obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_Sha512___del___obj,
mod_trezorcrypto_Sha512___del__);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha512_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_Sha512_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_update),
MP_ROM_PTR(&mod_trezorcrypto_Sha512_update_obj)},
{MP_ROM_QSTR(MP_QSTR_digest),
@@ -104,7 +104,7 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_Sha512_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_block_size), MP_ROM_INT(SHA512_BLOCK_LENGTH)},
{MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_INT(SHA512_DIGEST_LENGTH)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha512_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_Sha512_locals_dict,
mod_trezorcrypto_Sha512_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-shamir.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-shamir.h
index 1c6b6f3b..153e0bc7 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-shamir.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-shamir.h
@@ -78,18 +78,18 @@ mp_obj_t mod_trezorcrypto_shamir_interpolate(mp_obj_t shares, mp_obj_t x) {
}
return mp_obj_new_bytes_from_vstr(&vstr);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_shamir_interpolate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_shamir_interpolate_obj,
mod_trezorcrypto_shamir_interpolate);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_shamir_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_shamir_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_shamir)},
{MP_ROM_QSTR(MP_QSTR_interpolate),
MP_ROM_PTR(&mod_trezorcrypto_shamir_interpolate_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_shamir_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_shamir_globals,
mod_trezorcrypto_shamir_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_shamir_module = {
+static const mp_obj_module_t mod_trezorcrypto_shamir_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_shamir_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-slip39.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-slip39.h
index 587d2439..a4e3b7a8 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-slip39.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-slip39.h
@@ -29,7 +29,7 @@
/// Finds index of given word.
/// Raises ValueError if not found.
/// """
-STATIC mp_obj_t mod_trezorcrypto_slip39_word_index(mp_obj_t _word) {
+static mp_obj_t mod_trezorcrypto_slip39_word_index(mp_obj_t _word) {
mp_buffer_info_t word = {0};
mp_get_buffer_raise(_word, &word, MP_BUFFER_READ);
@@ -40,14 +40,14 @@ STATIC mp_obj_t mod_trezorcrypto_slip39_word_index(mp_obj_t _word) {
}
return mp_obj_new_int_from_uint(result);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_slip39_word_index_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_slip39_word_index_obj,
mod_trezorcrypto_slip39_word_index);
/// def get_word(index: int) -> str:
/// """
/// Returns word on position 'index'.
/// """
-STATIC mp_obj_t mod_trezorcrypto_slip39_get_word(mp_obj_t _index) {
+static mp_obj_t mod_trezorcrypto_slip39_get_word(mp_obj_t _index) {
uint16_t index = mp_obj_get_int(_index);
const char *word = get_word(index);
@@ -58,20 +58,20 @@ STATIC mp_obj_t mod_trezorcrypto_slip39_get_word(mp_obj_t _index) {
return mp_obj_new_str_copy(&mp_type_str, (const uint8_t *)word, strlen(word));
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_slip39_get_word_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_slip39_get_word_obj,
mod_trezorcrypto_slip39_get_word);
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_slip39_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_slip39_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_slip39)},
{MP_ROM_QSTR(MP_QSTR_word_index),
MP_ROM_PTR(&mod_trezorcrypto_slip39_word_index_obj)},
{MP_ROM_QSTR(MP_QSTR_get_word),
MP_ROM_PTR(&mod_trezorcrypto_slip39_get_word_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_slip39_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_slip39_globals,
mod_trezorcrypto_slip39_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_slip39_module = {
+static const mp_obj_module_t mod_trezorcrypto_slip39_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_slip39_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-tropic.h b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-tropic.h
index 168cf7da..142cbd30 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-tropic.h
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto-tropic.h
@@ -43,7 +43,7 @@ MP_DEFINE_EXCEPTION(TropicError, Exception)
/// """
/// Test the session by pinging the chip.
/// """
-STATIC mp_obj_t mod_trezorcrypto_tropic_ping(mp_obj_t message) {
+static mp_obj_t mod_trezorcrypto_tropic_ping(mp_obj_t message) {
mp_buffer_info_t message_b = {0};
mp_get_buffer_raise(message, &message_b, MP_BUFFER_READ);
@@ -60,7 +60,7 @@ STATIC mp_obj_t mod_trezorcrypto_tropic_ping(mp_obj_t message) {
return mp_obj_new_str_from_vstr(&result);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_ping_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_ping_obj,
mod_trezorcrypto_tropic_ping);
/// def key_generate(
@@ -69,7 +69,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_ping_obj,
/// """
/// Generate ECC key in the device's ECC key slot.
/// """
-STATIC mp_obj_t mod_trezorcrypto_tropic_key_generate(mp_obj_t key_index) {
+static mp_obj_t mod_trezorcrypto_tropic_key_generate(mp_obj_t key_index) {
mp_int_t idx = mp_obj_get_int(key_index);
if (idx < 0 || idx >= ECC_SLOT_COUNT) {
mp_raise_ValueError(MP_ERROR_TEXT("Invalid index."));
@@ -83,7 +83,7 @@ STATIC mp_obj_t mod_trezorcrypto_tropic_key_generate(mp_obj_t key_index) {
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_key_generate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_key_generate_obj,
mod_trezorcrypto_tropic_key_generate);
/// def sign(
@@ -93,7 +93,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_key_generate_obj,
/// """
/// Uses the private key at key_index to produce a signature of the digest.
/// """
-STATIC mp_obj_t mod_trezorcrypto_tropic_sign(mp_obj_t key_index,
+static mp_obj_t mod_trezorcrypto_tropic_sign(mp_obj_t key_index,
mp_obj_t digest) {
mp_int_t idx = mp_obj_get_int(key_index);
if (idx < 0 || idx >= ECC_SLOT_COUNT) {
@@ -117,7 +117,7 @@ STATIC mp_obj_t mod_trezorcrypto_tropic_sign(mp_obj_t key_index,
sig.len = sizeof(ed25519_signature);
return mp_obj_new_bytes_from_vstr(&sig);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_tropic_sign_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_tropic_sign_obj,
mod_trezorcrypto_tropic_sign);
static bool get_slot_range(int index, uint16_t *first_slot,
@@ -141,7 +141,7 @@ static bool get_slot_range(int index, uint16_t *first_slot,
/// """
/// Return the user data stored at the given index.
/// """
-STATIC mp_obj_t mod_trezorcrypto_tropic_get_user_data(mp_obj_t index) {
+static mp_obj_t mod_trezorcrypto_tropic_get_user_data(mp_obj_t index) {
mp_int_t idx = mp_obj_get_int(index);
uint16_t first_slot = 0;
uint16_t slot_count = 0;
@@ -167,7 +167,7 @@ STATIC mp_obj_t mod_trezorcrypto_tropic_get_user_data(mp_obj_t index) {
data.len = data_size;
return mp_obj_new_bytes_from_vstr(&data);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_get_user_data_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_get_user_data_obj,
mod_trezorcrypto_tropic_get_user_data);
/// DEVICE_CERT_INDEX: int
@@ -175,7 +175,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_tropic_get_user_data_obj,
/// FIDO_CERT_INDEX: int
/// FIDO_KEY_SLOT: int
-STATIC const mp_rom_map_elem_t mod_trezorcrypto_tropic_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorcrypto_tropic_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_tropic)},
{MP_ROM_QSTR(MP_QSTR_DEVICE_CERT_INDEX),
MP_ROM_INT(TROPIC_DEVICE_CERT_INDEX)},
@@ -189,10 +189,10 @@ STATIC const mp_rom_map_elem_t mod_trezorcrypto_tropic_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_get_user_data),
MP_ROM_PTR(&mod_trezorcrypto_tropic_get_user_data_obj)},
{MP_ROM_QSTR(MP_QSTR_TropicError), MP_ROM_PTR(&mp_type_TropicError)}};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorcrypto_tropic_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorcrypto_tropic_globals,
mod_trezorcrypto_tropic_globals_table);
-STATIC const mp_obj_module_t mod_trezorcrypto_tropic_module = {
+static const mp_obj_module_t mod_trezorcrypto_tropic_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorcrypto_tropic_globals,
};
diff --git a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto.c b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto.c
index 15d1c214..82edf4e8 100644
--- a/core/embed/upymod/modtrezorcrypto/modtrezorcrypto.c
+++ b/core/embed/upymod/modtrezorcrypto/modtrezorcrypto.c
@@ -83,7 +83,7 @@ static void wrapped_ui_wait_callback(uint32_t current, uint32_t total) {
MP_DEFINE_EXCEPTION(AuthenticationError, Exception)
-STATIC const mp_rom_map_elem_t mp_module_trezorcrypto_globals_table[] = {
+static const mp_rom_map_elem_t mp_module_trezorcrypto_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_trezorcrypto)},
{MP_ROM_QSTR(MP_QSTR_AuthenticationError),
MP_ROM_PTR(&mp_type_AuthenticationError)},
@@ -157,7 +157,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorcrypto_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_mcu), MP_ROM_PTR(&mod_trezorcrypto_mcu_module)},
#endif
};
-STATIC MP_DEFINE_CONST_DICT(mp_module_trezorcrypto_globals,
+static MP_DEFINE_CONST_DICT(mp_module_trezorcrypto_globals,
mp_module_trezorcrypto_globals_table);
const mp_obj_module_t mp_module_trezorcrypto = {
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-fatfs.h b/core/embed/upymod/modtrezorio/modtrezorio-fatfs.h
index 6c8acc17..7ccbe2b3 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-fatfs.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-fatfs.h
@@ -129,7 +129,7 @@ DRESULT disk_ioctl(BYTE pdrv, BYTE cmd, void *buff) {
}
}
-STATIC mp_obj_t filinfo_to_tuple(const FILINFO *info) {
+static mp_obj_t filinfo_to_tuple(const FILINFO *info) {
mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
tuple->items[0] = mp_obj_new_int_from_uint(info->fsize);
char attrs[] = "-----";
@@ -176,7 +176,7 @@ typedef struct _mp_obj_FatFSFile_t {
/// """
/// Close an open file object
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile___exit__(size_t n_args,
+static mp_obj_t mod_trezorio_FatFSFile___exit__(size_t n_args,
const mp_obj_t *args) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(args[0]);
FRESULT res = f_close(&(o->fp));
@@ -185,7 +185,7 @@ STATIC mp_obj_t mod_trezorio_FatFSFile___exit__(size_t n_args,
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_FatFSFile___exit___obj,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_FatFSFile___exit___obj,
4, 4,
mod_trezorio_FatFSFile___exit__);
@@ -193,7 +193,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_FatFSFile___exit___obj,
/// """
/// Close an open file object
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_close(mp_obj_t self) {
+static mp_obj_t mod_trezorio_FatFSFile_close(mp_obj_t self) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
FRESULT res = f_close(&(o->fp));
if (res != FR_OK) {
@@ -201,14 +201,14 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_close(mp_obj_t self) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_close_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_close_obj,
mod_trezorio_FatFSFile_close);
/// def read(self, data: bytearray) -> int:
/// """
/// Read data from the file
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_read(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorio_FatFSFile_read(mp_obj_t self, mp_obj_t data) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t buf = {0};
mp_get_buffer_raise(data, &buf, MP_BUFFER_WRITE);
@@ -219,14 +219,14 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_read(mp_obj_t self, mp_obj_t data) {
}
return mp_obj_new_int_from_uint(read);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_read_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_read_obj,
mod_trezorio_FatFSFile_read);
/// def write(self, data: AnyBytes) -> int:
/// """
/// Write data to the file
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_write(mp_obj_t self, mp_obj_t data) {
+static mp_obj_t mod_trezorio_FatFSFile_write(mp_obj_t self, mp_obj_t data) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
mp_buffer_info_t buf = {0};
mp_get_buffer_raise(data, &buf, MP_BUFFER_READ);
@@ -241,14 +241,14 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_write(mp_obj_t self, mp_obj_t data) {
}
return mp_obj_new_int_from_uint(written);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_write_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_write_obj,
mod_trezorio_FatFSFile_write);
/// def seek(self, offset: int) -> None:
/// """
/// Move file pointer of the file object
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_seek(mp_obj_t self, mp_obj_t offset) {
+static mp_obj_t mod_trezorio_FatFSFile_seek(mp_obj_t self, mp_obj_t offset) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
FSIZE_t ofs = trezor_obj_get_uint(offset);
FRESULT res = f_lseek(&(o->fp), ofs);
@@ -257,14 +257,14 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_seek(mp_obj_t self, mp_obj_t offset) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_seek_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_FatFSFile_seek_obj,
mod_trezorio_FatFSFile_seek);
/// def truncate(self) -> None:
/// """
/// Truncate the file
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_truncate(mp_obj_t self) {
+static mp_obj_t mod_trezorio_FatFSFile_truncate(mp_obj_t self) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
FRESULT res = f_truncate(&(o->fp));
if (res != FR_OK) {
@@ -272,14 +272,14 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_truncate(mp_obj_t self) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_truncate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_truncate_obj,
mod_trezorio_FatFSFile_truncate);
/// def sync(self) -> None:
/// """
/// Flush cached data of the writing file
/// """
-STATIC mp_obj_t mod_trezorio_FatFSFile_sync(mp_obj_t self) {
+static mp_obj_t mod_trezorio_FatFSFile_sync(mp_obj_t self) {
mp_obj_FatFSFile_t *o = MP_OBJ_TO_PTR(self);
FRESULT res = f_sync(&(o->fp));
if (res != FR_OK) {
@@ -287,10 +287,10 @@ STATIC mp_obj_t mod_trezorio_FatFSFile_sync(mp_obj_t self) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_sync_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSFile_sync_obj,
mod_trezorio_FatFSFile_sync);
-STATIC const mp_rom_map_elem_t mod_trezorio_FatFSFile_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_FatFSFile_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj)},
{MP_ROM_QSTR(MP_QSTR___exit__),
MP_ROM_PTR(&mod_trezorio_FatFSFile___exit___obj)},
@@ -302,7 +302,7 @@ STATIC const mp_rom_map_elem_t mod_trezorio_FatFSFile_locals_dict_table[] = {
MP_ROM_PTR(&mod_trezorio_FatFSFile_truncate_obj)},
{MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mod_trezorio_FatFSFile_sync_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_FatFSFile_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorio_FatFSFile_locals_dict,
mod_trezorio_FatFSFile_locals_dict_table);
// clang-format off
@@ -324,7 +324,7 @@ typedef struct _mp_obj_FatFSDir_t {
/// """
/// Read an entry in the directory
/// """
-STATIC mp_obj_t mod_trezorio_FatFSDir_iternext(mp_obj_t self) {
+static mp_obj_t mod_trezorio_FatFSDir_iternext(mp_obj_t self) {
mp_obj_FatFSDir_t *o = MP_OBJ_TO_PTR(self);
FILINFO info = {0};
FRESULT res = f_readdir(&(o->dp), &info);
@@ -338,7 +338,7 @@ STATIC mp_obj_t mod_trezorio_FatFSDir_iternext(mp_obj_t self) {
}
return filinfo_to_tuple(&info);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSDir_iternext_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_FatFSDir_iternext_obj,
mod_trezorio_FatFSDir_iternext);
// clang-format off
@@ -353,7 +353,7 @@ static MP_DEFINE_CONST_OBJ_TYPE(mod_trezorio_FatFSDir_type,
/// """
/// Open or create a file
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_open(mp_obj_t path, mp_obj_t flags) {
+static mp_obj_t mod_trezorio_fatfs_open(mp_obj_t path, mp_obj_t flags) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t _path = {0}, _flags = {0};
mp_get_buffer_raise(path, &_path, MP_BUFFER_READ);
@@ -389,14 +389,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_open(mp_obj_t path, mp_obj_t flags) {
f->fp = fp;
return f;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_fatfs_open_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_fatfs_open_obj,
mod_trezorio_fatfs_open);
/// def listdir(path: str) -> FatFSDir:
/// """
/// List a directory (return generator)
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_listdir(mp_obj_t path) {
+static mp_obj_t mod_trezorio_fatfs_listdir(mp_obj_t path) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t _path = {0};
mp_get_buffer_raise(path, &_path, MP_BUFFER_READ);
@@ -410,14 +410,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_listdir(mp_obj_t path) {
d->dp = dp;
return d;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_listdir_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_listdir_obj,
mod_trezorio_fatfs_listdir);
/// def mkdir(path: str, exist_ok: bool=False) -> None:
/// """
/// Create a sub directory
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_mkdir(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorio_fatfs_mkdir(size_t n_args, const mp_obj_t *args) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t path = {0};
mp_get_buffer_raise(args[0], &path, MP_BUFFER_READ);
@@ -431,14 +431,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_mkdir(size_t n_args, const mp_obj_t *args) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_fatfs_mkdir_obj, 1, 2,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_fatfs_mkdir_obj, 1, 2,
mod_trezorio_fatfs_mkdir);
/// def unlink(path: str) -> None:
/// """
/// Delete an existing file or directory
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_unlink(mp_obj_t path) {
+static mp_obj_t mod_trezorio_fatfs_unlink(mp_obj_t path) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t _path = {0};
mp_get_buffer_raise(path, &_path, MP_BUFFER_READ);
@@ -448,14 +448,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_unlink(mp_obj_t path) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_unlink_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_unlink_obj,
mod_trezorio_fatfs_unlink);
/// def stat(path: str) -> tuple[int, str, str]:
/// """
/// Get file status
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_stat(mp_obj_t path) {
+static mp_obj_t mod_trezorio_fatfs_stat(mp_obj_t path) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t _path = {0};
mp_get_buffer_raise(path, &_path, MP_BUFFER_READ);
@@ -466,14 +466,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_stat(mp_obj_t path) {
}
return filinfo_to_tuple(&info);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_stat_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_stat_obj,
mod_trezorio_fatfs_stat);
/// def rename(oldpath: str, newpath: str) -> None:
/// """
/// Rename/Move a file or directory
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_rename(mp_obj_t oldpath, mp_obj_t newpath) {
+static mp_obj_t mod_trezorio_fatfs_rename(mp_obj_t oldpath, mp_obj_t newpath) {
FATFS_ONLY_MOUNTED;
mp_buffer_info_t _oldpath = {0}, _newpath = {0};
mp_get_buffer_raise(oldpath, &_oldpath, MP_BUFFER_READ);
@@ -484,14 +484,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_rename(mp_obj_t oldpath, mp_obj_t newpath) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_fatfs_rename_obj,
+static MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorio_fatfs_rename_obj,
mod_trezorio_fatfs_rename);
/// def mount() -> None:
/// """
/// Mount the SD card filesystem.
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_mount() {
+static mp_obj_t mod_trezorio_fatfs_mount() {
FRESULT res = f_mount(&fs_instance, "", 1);
if (res != FR_OK) {
if (res == FR_NO_FILESYSTEM) {
@@ -502,33 +502,33 @@ STATIC mp_obj_t mod_trezorio_fatfs_mount() {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_mount_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_mount_obj,
mod_trezorio_fatfs_mount);
/// def unmount() -> None:
/// """
/// Unmount the SD card filesystem.
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_unmount() {
+static mp_obj_t mod_trezorio_fatfs_unmount() {
_fatfs_unmount_instance();
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_unmount_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_unmount_obj,
mod_trezorio_fatfs_unmount);
/// def is_mounted() -> bool:
/// """
/// Check if the filesystem is mounted.
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_is_mounted() {
+static mp_obj_t mod_trezorio_fatfs_is_mounted() {
return mp_obj_new_bool(_fatfs_instance_is_mounted());
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_is_mounted_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_fatfs_is_mounted_obj,
mod_trezorio_fatfs_is_mounted);
-STATIC mp_obj_t ui_wait_callback = mp_const_none;
+static mp_obj_t ui_wait_callback = mp_const_none;
-STATIC void wrapped_ui_wait_callback(uint32_t current) {
+static void wrapped_ui_wait_callback(uint32_t current) {
if (mp_obj_is_callable(ui_wait_callback)) {
mp_call_function_1_protected(ui_wait_callback, mp_obj_new_int(current));
}
@@ -538,7 +538,7 @@ STATIC void wrapped_ui_wait_callback(uint32_t current) {
/// """
/// Create a FAT volume on the SD card,
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_mkfs(size_t n_args, const mp_obj_t *args) {
+static mp_obj_t mod_trezorio_fatfs_mkfs(size_t n_args, const mp_obj_t *args) {
if (_fatfs_instance_is_mounted()) {
FATFS_RAISE(FatFSError, FR_LOCKED);
}
@@ -561,14 +561,14 @@ STATIC mp_obj_t mod_trezorio_fatfs_mkfs(size_t n_args, const mp_obj_t *args) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_fatfs_mkfs_obj, 0, 1,
+static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_trezorio_fatfs_mkfs_obj, 0, 1,
mod_trezorio_fatfs_mkfs);
/// def setlabel(label: str) -> None:
/// """
/// Set volume label
/// """
-STATIC mp_obj_t mod_trezorio_fatfs_setlabel(mp_obj_t label) {
+static mp_obj_t mod_trezorio_fatfs_setlabel(mp_obj_t label) {
/* setlabel is marked as only-mounted, because "mounting" in ff.c terms means
having parsed the FAT table, which is of course a prerequisite for setting
label. */
@@ -581,10 +581,10 @@ STATIC mp_obj_t mod_trezorio_fatfs_setlabel(mp_obj_t label) {
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_setlabel_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_fatfs_setlabel_obj,
mod_trezorio_fatfs_setlabel);
-STATIC const mp_rom_map_elem_t mod_trezorio_fatfs_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_fatfs_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fatfs)},
{MP_ROM_QSTR(MP_QSTR_FatFSFile), MP_ROM_PTR(&mod_trezorio_FatFSFile_type)},
{MP_ROM_QSTR(MP_QSTR_FatFSDir), MP_ROM_PTR(&mod_trezorio_FatFSDir_type)},
@@ -632,10 +632,10 @@ STATIC const mp_rom_map_elem_t mod_trezorio_fatfs_globals_table[] = {
FATFS_ROM_INT(FR_INVALID_PARAMETER)},
{MP_ROM_QSTR(MP_QSTR_FR_NO_SPACE), FATFS_ROM_INT(FR_NO_SPACE)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_fatfs_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorio_fatfs_globals,
mod_trezorio_fatfs_globals_table);
-STATIC const mp_obj_module_t mod_trezorio_fatfs_module = {
+static const mp_obj_module_t mod_trezorio_fatfs_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorio_fatfs_globals,
};
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-haptic.h b/core/embed/upymod/modtrezorio/modtrezorio-haptic.h
index 3e332f4e..e2f33117 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-haptic.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-haptic.h
@@ -25,23 +25,23 @@
/// """
/// Enable/Disable the haptic feedback.
/// """
-STATIC mp_obj_t mod_trezorio_haptic_set_enabled(mp_obj_t enable) {
+static mp_obj_t mod_trezorio_haptic_set_enabled(mp_obj_t enable) {
haptic_set_enabled(mp_obj_is_true(enable));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_haptic_set_enabled_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_haptic_set_enabled_obj,
mod_trezorio_haptic_set_enabled);
-STATIC const mp_rom_map_elem_t mod_trezorio_haptic_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_haptic_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_haptic)},
{MP_ROM_QSTR(MP_QSTR_haptic_set_enabled),
MP_ROM_PTR(&mod_trezorio_haptic_set_enabled_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_haptic_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorio_haptic_globals,
mod_trezorio_haptic_globals_table);
-STATIC const mp_obj_module_t mod_trezorio_haptic_module = {
+static const mp_obj_module_t mod_trezorio_haptic_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorio_haptic_globals,
};
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-ipc.h b/core/embed/upymod/modtrezorio/modtrezorio-ipc.h
index 80167326..ace68a53 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-ipc.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-ipc.h
@@ -27,7 +27,7 @@
/// """
/// Sends an IPC message to the specified remote task.
/// """
-STATIC mp_obj_t mod_trezorio_ipc_send(mp_obj_t remote_obj, mp_obj_t fn_obj,
+static mp_obj_t mod_trezorio_ipc_send(mp_obj_t remote_obj, mp_obj_t fn_obj,
mp_obj_t data_obj) {
mp_buffer_info_t bufinfo = {0};
mp_get_buffer_raise(data_obj, &bufinfo, MP_BUFFER_READ);
@@ -41,7 +41,7 @@ STATIC mp_obj_t mod_trezorio_ipc_send(mp_obj_t remote_obj, mp_obj_t fn_obj,
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorio_ipc_send_obj,
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorio_ipc_send_obj,
mod_trezorio_ipc_send);
/// class IpcMessage:
@@ -57,29 +57,29 @@ typedef struct _mp_obj_IpcMessage_t {
/// """
/// Returns the function number.
/// """
-STATIC mp_obj_t mod_trezorio_IpcMessage_fn(mp_obj_t self) {
+static mp_obj_t mod_trezorio_IpcMessage_fn(mp_obj_t self) {
mp_obj_IpcMessage_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_int_from_uint(o->message.fn);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_fn_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_fn_obj,
mod_trezorio_IpcMessage_fn);
/// def remote(self) -> int:
/// """
/// Returns the remote task ID.
/// """
-STATIC mp_obj_t mod_trezorio_IpcMessage_remote(mp_obj_t self) {
+static mp_obj_t mod_trezorio_IpcMessage_remote(mp_obj_t self) {
mp_obj_IpcMessage_t *o = MP_OBJ_TO_PTR(self);
return MP_OBJ_NEW_SMALL_INT(o->message.remote);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_remote_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_remote_obj,
mod_trezorio_IpcMessage_remote);
/// def free(self) -> None:
/// """
/// Frees the IPC message resources.
/// """
-STATIC mp_obj_t mod_trezorio_IpcMessage_free(mp_obj_t self) {
+static mp_obj_t mod_trezorio_IpcMessage_free(mp_obj_t self) {
mp_obj_IpcMessage_t *o = MP_OBJ_TO_PTR(self);
ipc_message_free(&o->message);
@@ -87,29 +87,29 @@ STATIC mp_obj_t mod_trezorio_IpcMessage_free(mp_obj_t self) {
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_free_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_free_obj,
mod_trezorio_IpcMessage_free);
/// def data(self) -> bytes:
/// """
/// Returns the IPC message data as bytes.
/// """
-STATIC mp_obj_t mod_trezorio_IpcMessage_data(mp_obj_t self) {
+static mp_obj_t mod_trezorio_IpcMessage_data(mp_obj_t self) {
mp_obj_IpcMessage_t *o = MP_OBJ_TO_PTR(self);
return mp_obj_new_bytes(o->message.data, o->message.size);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_data_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_IpcMessage_data_obj,
mod_trezorio_IpcMessage_data);
-STATIC const mp_rom_map_elem_t mod_trezorio_IpcMessage_locals_dict_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_IpcMessage_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR_remote),
MP_ROM_PTR(&mod_trezorio_IpcMessage_remote_obj)},
{MP_ROM_QSTR(MP_QSTR_fn), MP_ROM_PTR(&mod_trezorio_IpcMessage_fn_obj)},
{MP_ROM_QSTR(MP_QSTR_data), MP_ROM_PTR(&mod_trezorio_IpcMessage_data_obj)},
{MP_ROM_QSTR(MP_QSTR_free), MP_ROM_PTR(&mod_trezorio_IpcMessage_free_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_IpcMessage_locals_dict,
+static MP_DEFINE_CONST_DICT(mod_trezorio_IpcMessage_locals_dict,
mod_trezorio_IpcMessage_locals_dict_table);
// clang-format off
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-pm.h b/core/embed/upymod/modtrezorio/modtrezorio-pm.h
index 89f8d19a..623f7f69 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-pm.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-pm.h
@@ -46,7 +46,7 @@
/// Returns the state of charge (SoC) in percent (0-100). Raises
/// RuntimeError on failure.
/// """
-STATIC mp_obj_t mod_trezorio_pm_soc() {
+static mp_obj_t mod_trezorio_pm_soc() {
pm_state_t state = {0};
pm_status_t res = pm_get_state(&state);
if (res != PM_OK) {
@@ -55,7 +55,7 @@ STATIC mp_obj_t mod_trezorio_pm_soc() {
}
return mp_obj_new_int(state.soc);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_soc_obj, mod_trezorio_pm_soc);
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_soc_obj, mod_trezorio_pm_soc);
/// def suspend() -> int:
/// """
@@ -63,7 +63,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_soc_obj, mod_trezorio_pm_soc);
/// failure.
/// Wakeup flags: BUTTON=1, POWER=2, BLE=4, NFC=8, RTC=16, USB=32, TOUCH=64
/// """
-STATIC mp_obj_t mod_trezorio_pm_suspend() {
+static mp_obj_t mod_trezorio_pm_suspend() {
wakeup_flags_t wakeup_flags = 0;
pm_status_t res = pm_suspend(&wakeup_flags);
if (res != PM_OK) {
@@ -71,21 +71,21 @@ STATIC mp_obj_t mod_trezorio_pm_suspend() {
}
return mp_obj_new_int_from_uint(wakeup_flags);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_suspend_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_suspend_obj,
mod_trezorio_pm_suspend);
/// def hibernate() -> None:
/// """
/// Hibernates the device. Raises RuntimeError on failure.
/// """
-STATIC mp_obj_t mod_trezorio_pm_hibernate() {
+static mp_obj_t mod_trezorio_pm_hibernate() {
pm_status_t res = pm_hibernate();
if (res != PM_OK) {
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Failed to hibernate"));
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_hibernate_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_hibernate_obj,
mod_trezorio_pm_hibernate);
/// def is_usb_connected() -> bool:
@@ -93,7 +93,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_hibernate_obj,
/// Returns True if USB is connected, False otherwise. Raises RuntimeError
/// on failure.
/// """
-STATIC mp_obj_t mod_trezorio_pm_is_usb_connected() {
+static mp_obj_t mod_trezorio_pm_is_usb_connected() {
pm_state_t state;
pm_status_t res = pm_get_state(&state);
if (res != PM_OK) {
@@ -102,7 +102,7 @@ STATIC mp_obj_t mod_trezorio_pm_is_usb_connected() {
}
return mp_obj_new_bool(state.usb_connected);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_usb_connected_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_usb_connected_obj,
mod_trezorio_pm_is_usb_connected);
/// def is_wireless_connected() -> bool:
@@ -110,7 +110,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_usb_connected_obj,
/// Returns True if Wireless power source is connected, False otherwise.
/// Raises RuntimeError on failure.
/// """
-STATIC mp_obj_t mod_trezorio_pm_is_wireless_connected() {
+static mp_obj_t mod_trezorio_pm_is_wireless_connected() {
pm_state_t state;
pm_status_t res = pm_get_state(&state);
if (res != PM_OK) {
@@ -119,7 +119,7 @@ STATIC mp_obj_t mod_trezorio_pm_is_wireless_connected() {
}
return mp_obj_new_bool(state.wireless_connected);
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_wireless_connected_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_wireless_connected_obj,
mod_trezorio_pm_is_wireless_connected);
#ifdef TREZOR_EMULATOR
@@ -138,7 +138,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_pm_is_wireless_connected_obj,
/// Only available on emulator. Pass None to leave a field unchanged.
/// Charging status and power status are derived from connection states.
/// """
-STATIC mp_obj_t mod_trezorio_pm_set_emu_battery_state(size_t n_args,
+static mp_obj_t mod_trezorio_pm_set_emu_battery_state(size_t n_args,
const mp_obj_t* pos_args,
mp_map_t* kw_args) {
static const mp_arg_t allowed_args[] = {
@@ -177,12 +177,12 @@ STATIC mp_obj_t mod_trezorio_pm_set_emu_battery_state(size_t n_args,
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_trezorio_pm_set_emu_battery_state_obj, 0,
+static MP_DEFINE_CONST_FUN_OBJ_KW(mod_trezorio_pm_set_emu_battery_state_obj, 0,
mod_trezorio_pm_set_emu_battery_state);
#endif
#endif
-STATIC const mp_rom_map_elem_t mod_trezorio_pm_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_pm_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pm)},
{MP_ROM_QSTR(MP_QSTR_soc), MP_ROM_PTR(&mod_trezorio_pm_soc_obj)},
{MP_ROM_QSTR(MP_QSTR_suspend), MP_ROM_PTR(&mod_trezorio_pm_suspend_obj)},
@@ -222,10 +222,10 @@ STATIC const mp_rom_map_elem_t mod_trezorio_pm_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR_EVENT_BATTERY_TEMP_JUMP_UPDATED), MP_ROM_INT(1 << 9)},
{MP_ROM_QSTR(MP_QSTR_EVENT_SOC_UPDATED), MP_ROM_INT(1 << 10)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_pm_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorio_pm_globals,
mod_trezorio_pm_globals_table);
-STATIC const mp_obj_module_t mod_trezorio_pm_module = {
+static const mp_obj_module_t mod_trezorio_pm_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t*)&mod_trezorio_pm_globals,
};
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-poll.h b/core/embed/upymod/modtrezorio/modtrezorio-poll.h
index f5f0e41b..a649e9f6 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-poll.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-poll.h
@@ -87,7 +87,7 @@ static mp_obj_t parse_ble_event_data(const ble_event_t *event) {
///
/// If timeout occurs, False is returned, True otherwise.
/// """
-STATIC mp_obj_t mod_trezorio_poll(mp_obj_t ifaces, mp_obj_t list_ref,
+static mp_obj_t mod_trezorio_poll(mp_obj_t ifaces, mp_obj_t list_ref,
mp_obj_t timeout_ms) {
mp_obj_list_t *ret = MP_OBJ_TO_PTR(list_ref);
if (!MP_OBJ_IS_TYPE(list_ref, &mp_type_list) || ret->len < 2) {
@@ -268,4 +268,4 @@ STATIC mp_obj_t mod_trezorio_poll(mp_obj_t ifaces, mp_obj_t list_ref,
}
}
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorio_poll_obj, mod_trezorio_poll);
+static MP_DEFINE_CONST_FUN_OBJ_3(mod_trezorio_poll_obj, mod_trezorio_poll);
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-rgb_led.h b/core/embed/upymod/modtrezorio/modtrezorio-rgb_led.h
index 1489dbe7..b0c44d0d 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-rgb_led.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-rgb_led.h
@@ -25,23 +25,23 @@
/// """
/// Enable/Disable the RGB LED.
/// """
-STATIC mp_obj_t mod_trezorio_rgb_led_set_enabled(mp_obj_t enable) {
+static mp_obj_t mod_trezorio_rgb_led_set_enabled(mp_obj_t enable) {
rgb_led_set_enabled(mp_obj_is_true(enable));
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_rgb_led_set_enabled_obj,
+static MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorio_rgb_led_set_enabled_obj,
mod_trezorio_rgb_led_set_enabled);
-STATIC const mp_rom_map_elem_t mod_trezorio_rgb_led_globals_table[] = {
+static const mp_rom_map_elem_t mod_trezorio_rgb_led_globals_table[] = {
{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rgb_led)},
{MP_ROM_QSTR(MP_QSTR_rgb_led_set_enabled),
MP_ROM_PTR(&mod_trezorio_rgb_led_set_enabled_obj)},
};
-STATIC MP_DEFINE_CONST_DICT(mod_trezorio_rgb_led_globals,
+static MP_DEFINE_CONST_DICT(mod_trezorio_rgb_led_globals,
mod_trezorio_rgb_led_globals_table);
-STATIC const mp_obj_module_t mod_trezorio_rgb_led_module = {
+static const mp_obj_module_t mod_trezorio_rgb_led_module = {
.base = {&mp_type_module},
.globals = (mp_obj_dict_t *)&mod_trezorio_rgb_led_globals,
};
diff --git a/core/embed/upymod/modtrezorio/modtrezorio-sdcard.h b/core/embed/upymod/modtrezorio/modtrezorio-sdcard.h
index 3f10ff12..fba0fc36 100644
--- a/core/embed/upymod/modtrezorio/modtrezorio-sdcard.h
+++ b/core/embed/upymod/modtrezorio/modtrezorio-sdcard.h
@@ -29,10 +29,10 @@
/// """
/// Returns True if SD card is detected, False otherwise.
/// """
-STATIC mp_obj_t mod_trezorio_sdcard_is_present() {
+static mp_obj_t mod_trezorio_sdcard_is_present() {
return mp_obj_new_bool(sdcard_is_present());
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_is_present_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_is_present_obj,
mod_trezorio_sdcard_is_present);
/// def power_on() -> None:
@@ -41,36 +41,36 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_is_present_obj,
/// Raises OSError if the SD card cannot be powered on, e.g., when there
/// is no SD card inserted.
/// """
-STATIC mp_obj_t mod_trezorio_sdcard_power_on() {
+static mp_obj_t mod_trezorio_sdcard_power_on() {
if (sectrue != sdcard_power_on()) {
mp_raise_OSError(MP_EIO);
}
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_power_on_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_power_on_obj,
mod_trezorio_sdcard_power_on);
/// def power_off() -> None:
/// """
/// Power off the SD card interface.
/// """
-STATIC mp_obj_t mod_trezorio_sdcard_power_off() {
+static mp_obj_t mod_trezorio_sdcard_power_off() {
/* XXX should this call happen inside sdcard_power_off()? */
_fatfs_unmount_instance();
sdcard_power_off();
return mp_const_none;
}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_power_off_obj,
+static MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorio_sdcard_power_off_obj,
mod_trezorio_sdcard_power_off);
/// def capacity() -> int:
/// """
/// Returns capacity of the SDRisk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.