arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00
Code Issues Releases Wiki Activity

chore(core/embed): refactor trezor_obj_get_uint64 into trezorobj.h

Browse Source 
[no changelog]
This commit is contained in:
Pavol Rusnak 2021-11-27 12:48:15 +01:00 committed by matejcik
parent e4b5f10223
commit 4a71d15b1d
2 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/embed/extmod/modtrezorcrypto/modtrezorcrypto-monero.h
View File

@ -21,6 +21,8 @@
#include "py/objint.h"
#include "py/objstr.h"
#include "embed/extmod/trezorobj.h"
#include "bignum.h"
#include "memzero.h"
#include "monero/monero.h"
@ -75,47 +77,6 @@ static inline void assert_scalar(const mp_obj_t o) {
}
}
static uint64_t mp_obj_uint64_get_checked(mp_const_obj_t self_in) {
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_MPZ
#error "MPZ supported only"
#endif
if (MP_OBJ_IS_SMALL_INT(self_in)) {
return MP_OBJ_SMALL_INT_VALUE(self_in);
} else {
byte buff[8] = {0};
uint64_t res = 0;
mp_obj_t *o = MP_OBJ_TO_PTR(self_in);
mp_obj_int_to_bytes_impl(o, true, 8, buff);
for (int i = 0; i < 8; i++) {
res <<= i > 0 ? 8 : 0;
res |= (uint64_t)(buff[i] & 0xff);
}
return res;
}
}
static uint64_t mp_obj_get_uint64(mp_const_obj_t arg) {
if (arg == mp_const_false) {
return 0;
} else if (arg == mp_const_true) {
return 1;
} else if (MP_OBJ_IS_SMALL_INT(arg)) {
return MP_OBJ_SMALL_INT_VALUE(arg);
} else if (MP_OBJ_IS_TYPE(arg, &mp_type_int)) {
return mp_obj_uint64_get_checked(arg);
} else {
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
mp_raise_TypeError("can't convert to int");
} else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
"can't convert %s to int",
mp_obj_get_type_str(arg)));
}
}
}
STATIC mp_obj_t mp_obj_new_scalar() {
mp_obj_bignum256modm_t *o = m_new_obj_with_finaliser(mp_obj_bignum256modm_t);
o->base.type = &mod_trezorcrypto_monero_bignum256modm_type;
@ -238,7 +199,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_bignum256modm_make_new(
} else if (n_args == 1 && MP_OBJ_IS_STR_OR_BYTES(args[0])) {
mp_unpack_scalar(o->p, args[0], 0);
} else if (n_args == 1 && mp_obj_is_integer(args[0])) {
uint64_t v = mp_obj_get_uint64(args[0]);
uint64_t v = trezor_obj_get_uint64(args[0]);
set256_modm(o->p, v);
} else {
mp_raise_ValueError("Invalid scalar constructor");
@ -332,7 +293,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_init256_modm(size_t n_args,
} else if (n_args > 0 && MP_OBJ_IS_STR_OR_BYTES(args[1 + off])) {
mp_unpack_scalar(MP_OBJ_SCALAR(res), args[1 + off], 0);
} else if (n_args > 0 && mp_obj_is_integer(args[1 + off])) {
uint64_t v = mp_obj_get_uint64(args[1 + off]);
uint64_t v = trezor_obj_get_uint64(args[1 + off]);
set256_modm(MP_OBJ_SCALAR(res), v);
} else {
mp_raise_ValueError("Invalid scalar def");
@ -1296,7 +1257,7 @@ STATIC mp_obj_t mod_trezorcrypto_monero_xmr_gen_c(size_t n_args,
mp_obj_t res = mp_obj_new_ge25519_r(res_arg ? args[0] : mp_const_none);
assert_scalar(args[1 + off]);
xmr_gen_c(&MP_OBJ_GE25519(res), MP_OBJ_C_SCALAR(args[1 + off]),
mp_obj_get_uint64(args[2 + off]));
trezor_obj_get_uint64(args[2 + off]));
return res;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(

18
core/embed/extmod/trezorobj.h
View File

@ -75,6 +75,24 @@ static inline uint8_t trezor_obj_get_uint8(mp_obj_t obj) {
return u;
}
static inline uint64_t trezor_obj_get_uint64(mp_const_obj_t obj) {
if (MP_OBJ_IS_SMALL_INT(obj)) {
mp_int_t i = MP_OBJ_SMALL_INT_VALUE(obj);
mp_uint_t u = i;
return u;
} else if (MP_OBJ_IS_TYPE(obj, &mp_type_int)) {
uint64_t u = 0;
mp_obj_int_t *self = MP_OBJ_TO_PTR(obj);
if (self->mpz.neg != 0) {
mp_raise_TypeError("value is negative");
}
mpz_as_bytes(&self->mpz, MP_ENDIANNESS_BIG, sizeof(uint64_t), (byte *)&u);
return u;
} else {
mp_raise_TypeError("value is not int");
}
}
bool trezor_obj_get_ll_checked(mp_obj_t obj, long long *value);
mp_obj_t trezor_obj_call_protected(void (*func)(void *), void *arg);