arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-27 00:48:12 +00:00
Code Issues Releases Wiki Activity

embed/extmod: use trezor_obj_get_uint for uint32_t

Browse Source
This commit is contained in:
Jan Pochyla 2018-05-14 16:44:08 +02:00
parent 71b4e9978c
commit 39c1c85abb
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
View File

@ -19,6 +19,8 @@
#include "py/objstr.h" #include "py/objstr.h"
#include "embed/extmod/trezorobj.h"
#include "bip32.h" #include "bip32.h"
#include "curves.h" #include "curves.h"
#include "memzero.h" #include "memzero.h"
@ -66,9 +68,9 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_make_new(const mp_obj_type_t *type, size
mp_buffer_info_t private_key; mp_buffer_info_t private_key;
mp_buffer_info_t public_key; mp_buffer_info_t public_key;
mp_buffer_info_t curve_name; mp_buffer_info_t curve_name;
const uint32_t depth = mp_obj_get_int_truncated(vals[0].u_obj); const uint32_t depth = trezor_obj_get_uint(vals[0].u_obj);
const uint32_t fingerprint = mp_obj_get_int_truncated(vals[1].u_obj); const uint32_t fingerprint = trezor_obj_get_uint(vals[1].u_obj);
const uint32_t child_num = mp_obj_get_int_truncated(vals[2].u_obj); const uint32_t child_num = trezor_obj_get_uint(vals[2].u_obj);
mp_get_buffer_raise(vals[3].u_obj, &chain_code, MP_BUFFER_READ); mp_get_buffer_raise(vals[3].u_obj, &chain_code, MP_BUFFER_READ);
mp_get_buffer_raise(vals[4].u_obj, &private_key, MP_BUFFER_READ); mp_get_buffer_raise(vals[4].u_obj, &private_key, MP_BUFFER_READ);
mp_get_buffer_raise(vals[5].u_obj, &public_key, MP_BUFFER_READ); mp_get_buffer_raise(vals[5].u_obj, &public_key, MP_BUFFER_READ);
@ -129,7 +131,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_make_new(const mp_obj_type_t *type, size
/// ''' /// '''
STATIC mp_obj_t mod_trezorcrypto_HDNode_derive(size_t n_args, const mp_obj_t *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]); mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(args[0]);
uint32_t i = mp_obj_get_int_truncated(args[1]); uint32_t i = trezor_obj_get_uint(args[1]);
uint32_t fp = hdnode_fingerprint(&o->hdnode); uint32_t fp = hdnode_fingerprint(&o->hdnode);
bool public = n_args > 2 && args[2] == mp_const_true; bool public = n_args > 2 && args[2] == mp_const_true;
@ -172,7 +174,7 @@ STATIC mp_obj_t mod_trezorcrypto_HDNode_derive_path(mp_obj_t self, mp_obj_t path
uint32_t pi; uint32_t pi;
uint32_t pints[plen]; uint32_t pints[plen];
for (pi = 0; pi < plen; pi++) { for (pi = 0; pi < plen; pi++) {
pints[pi] = mp_obj_get_int_truncated(pitems[pi]); pints[pi] = trezor_obj_get_uint(pitems[pi]);
} }
if (!hdnode_private_ckd_cached(&o->hdnode, pints, plen, &o->fingerprint)) { if (!hdnode_private_ckd_cached(&o->hdnode, pints, plen, &o->fingerprint)) {
@ -207,7 +209,7 @@ STATIC mp_obj_t serialize_public_private(mp_obj_t self, bool use_public, uint32_
/// Serialize the public info from HD node to base58 string. /// Serialize the public info from HD node to base58 string.
/// ''' /// '''
STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_public(mp_obj_t self, mp_obj_t version) { STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_public(mp_obj_t self, mp_obj_t version) {
uint32_t ver = mp_obj_get_int_truncated(version); uint32_t ver = trezor_obj_get_uint(version);
return serialize_public_private(self, true, ver); return serialize_public_private(self, true, ver);
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_public_obj, mod_trezorcrypto_HDNode_serialize_public); STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_public_obj, mod_trezorcrypto_HDNode_serialize_public);
@ -217,7 +219,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_public_obj, m
/// Serialize the private info HD node to base58 string. /// Serialize the private info HD node to base58 string.
/// ''' /// '''
STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_private(mp_obj_t self, mp_obj_t version) { STATIC mp_obj_t mod_trezorcrypto_HDNode_serialize_private(mp_obj_t self, mp_obj_t version) {
uint32_t ver = mp_obj_get_int_truncated(version); uint32_t ver = trezor_obj_get_uint(version);
return serialize_public_private(self, false, ver); return serialize_public_private(self, false, ver);
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_private_obj, mod_trezorcrypto_HDNode_serialize_private); STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_trezorcrypto_HDNode_serialize_private_obj, mod_trezorcrypto_HDNode_serialize_private);
@ -304,7 +306,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_trezorcrypto_HDNode_public_key_obj, mod_tre
STATIC mp_obj_t mod_trezorcrypto_HDNode_address(mp_obj_t self, mp_obj_t version) { 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); mp_obj_HDNode_t *o = MP_OBJ_TO_PTR(self);
uint32_t v = mp_obj_get_int_truncated(version); uint32_t v = trezor_obj_get_uint(version);
char address[ADDRESS_MAXLEN]; char address[ADDRESS_MAXLEN];
hdnode_get_address(&o->hdnode, v, address, ADDRESS_MAXLEN); hdnode_get_address(&o->hdnode, v, address, ADDRESS_MAXLEN);
return mp_obj_new_str(address, strlen(address), false); return mp_obj_new_str(address, strlen(address), false);
@ -359,8 +361,8 @@ STATIC mp_obj_t mod_trezorcrypto_bip32_deserialize(mp_obj_t value, mp_obj_t vers
if (valueb.len == 0) { if (valueb.len == 0) {
mp_raise_ValueError("Invalid value"); mp_raise_ValueError("Invalid value");
} }
uint32_t vpub = mp_obj_get_int_truncated(version_public); uint32_t vpub = trezor_obj_get_uint(version_public);
uint32_t vpriv = mp_obj_get_int_truncated(version_private); uint32_t vpriv = trezor_obj_get_uint(version_private);
HDNode hdnode; HDNode hdnode;
uint32_t fingerprint; uint32_t fingerprint;
if (hdnode_deserialize(valueb.buf, vpub, vpriv, SECP256K1_NAME, &hdnode, &fingerprint) < 0) { if (hdnode_deserialize(valueb.buf, vpub, vpriv, SECP256K1_NAME, &hdnode, &fingerprint) < 0) {

5
embed/extmod/modtrezorcrypto/modtrezorcrypto-crc.h
View File

@ -18,12 +18,15 @@
*/ */
#include "py/objstr.h" #include "py/objstr.h"
#include "embed/extmod/trezorobj.h"
#include "crc.h" #include "crc.h"
mp_obj_t mod_trezorcrypto_crc_crc32(size_t n_args, const mp_obj_t *args) { mp_obj_t mod_trezorcrypto_crc_crc32(size_t n_args, const mp_obj_t *args) {
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ); mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
uint32_t crc = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 0; uint32_t crc = (n_args > 1) ? trezor_obj_get_uint(args[1]) : 0;
crc = crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff); crc = crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff);
return mp_obj_new_int_from_uint(crc ^ 0xffffffff); return mp_obj_new_int_from_uint(crc ^ 0xffffffff);
} }

4
embed/extmod/modtrezorcrypto/modtrezorcrypto-random.h
View File

@ -19,6 +19,8 @@
#include "py/objstr.h" #include "py/objstr.h"
#include "embed/extmod/trezorobj.h"
#include "rand.h" #include "rand.h"
/// def uniform(n: int) -> int: /// def uniform(n: int) -> int:
@ -26,7 +28,7 @@
/// Compute uniform random number from interval 0 ... n - 1. /// 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 = mp_obj_get_int_truncated(n); uint32_t nn = trezor_obj_get_uint(n);
if (nn == 0) { if (nn == 0) {
mp_raise_ValueError("Maximum can't be zero"); mp_raise_ValueError("Maximum can't be zero");
} }

4
embed/extmod/modtrezorio/modtrezorio-poll.h
View File

@ -20,6 +20,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "embed/extmod/trezorobj.h"
#include "usb.h" #include "usb.h"
#define TOUCH_IFACE (255) #define TOUCH_IFACE (255)
@ -57,7 +59,7 @@ STATIC mp_obj_t mod_trezorio_poll(mp_obj_t ifaces, mp_obj_t list_ref, mp_obj_t t
mp_obj_t iter = mp_getiter(ifaces, &iterbuf); mp_obj_t iter = mp_getiter(ifaces, &iterbuf);
mp_obj_t item; mp_obj_t item;
while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
const mp_uint_t i = mp_obj_int_get_truncated(item); const mp_uint_t i = trezor_obj_get_uint(item);
const mp_uint_t iface = i & 0x00FF; const mp_uint_t iface = i & 0x00FF;
const mp_uint_t mode = i & 0xFF00; const mp_uint_t mode = i & 0xFF00;