d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add strict parameter to u32_from_BE

Browse Source
This commit is contained in:
pscott
2021-04-21 17:07:16 +02:00
parent 81ec019242
commit dafdc404ac
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils.c
View File

@@ -54,7 +54,8 @@ int local_strchr(char *string, char ch) {
}
// Almost like U4BE except that it takes `size` as a parameter.
uint32_t u32_from_BE(uint8_t *in, uint8_t size) {
// The `strict` parameter defines whether we should throw in case of a length > 4.
uint32_t u32_from_BE(uint8_t *in, uint8_t size, bool strict) {
uint32_t res = 0;
if (size == 1) {
res = in[0];
@@ -62,8 +63,11 @@ uint32_t u32_from_BE(uint8_t *in, uint8_t size) {
res = (in[0] << 8) | in[1];
} else if (size == 3) {
res = (in[0] << 16) | (in[1] << 8) | in[2];
} else {
} else if (size == 4) {
res = (in[0] << 24) | (in[1] << 16) | (in[2] << 8) | in[3];
} else if (strict && size != 0) {
PRINTF("Unexpected format\n");
THROW(EXCEPTION);
}
return res;
}

2
src/utils.h
View File

@@ -32,7 +32,7 @@ int local_strchr(char* string, char ch);
void u32_to_str(char* dest, uint8_t dest_size, uint32_t in);
// Converts a list of bytes (in BE) of length `size` to a uint32_t.
uint32_t u32_from_BE(uint8_t* in, uint8_t size);
uint32_t u32_from_BE(uint8_t* in, uint8_t size, bool strict);
void amountToString(uint8_t* amount,
uint8_t amount_len,

6
src_features/signTx/logic_signTx.c
View File

@@ -248,9 +248,9 @@ void finalizeParsing(bool direct) {
uint32_t id = 0;
if (txContext.txType == LEGACY) {
id = u32_from_BE(txContext.content->v, txContext.content->vLength);
id = u32_from_BE(txContext.content->v, txContext.content->vLength, true);
} else if (txContext.txType == EIP2930) {
id = u32_from_BE(txContext.content->chainID.value, txContext.content->chainID.length);
id = u32_from_BE(txContext.content->chainID.value, txContext.content->chainID.length, false);
} else {
PRINTF("TxType `%u` not supported while checking for chainID\n", txContext.txType);
return;
@@ -388,7 +388,7 @@ void finalizeParsing(bool direct) {
// Prepare chainID field
if (genericUI) {
if (txContext.txType == LEGACY) {
uint32_t id = u32_from_BE(txContext.content->v, txContext.content->vLength);
uint32_t id = u32_from_BE(txContext.content->v, txContext.content->vLength, true);
u32_to_str((char *) strings.common.chainID, sizeof(strings.common.chainID), id);
} else if (txContext.txType == EIP2930) {
uint256_t chainID;

2
src_features/signTx/ui_common_signTx.c
View File

@@ -8,7 +8,7 @@ unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e) {
uint8_t signatureLength;
cx_ecfp_private_key_t privateKey;
uint32_t tx = 0;
uint32_t v = u32_from_BE(tmpContent.txContent.v, tmpContent.txContent.vLength);
uint32_t v = u32_from_BE(tmpContent.txContent.v, tmpContent.txContent.vLength, true);
io_seproxyhal_io_heartbeat();
os_perso_derive_node_bip32(CX_CURVE_256K1,
tmpCtx.transactionContext.bip32Path,

4
src_features/signTx/ui_flow_signTx.c
View File

@@ -173,9 +173,9 @@ void ux_approve_tx(bool dataPresent) {
uint32_t id;
if (txContext.txType == LEGACY) {
id = u32_from_BE(txContext.content->v, txContext.content->vLength);
id = u32_from_BE(txContext.content->v, txContext.content->vLength, true);
} else if (txContext.txType == EIP2930) {
id = u32_from_BE(txContext.content->chainID.value, txContext.content->chainID.length);
id = u32_from_BE(txContext.content->chainID.value, txContext.content->chainID.length, false);
} else {
PRINTF("TxType `%u` not supported while preparing to approve tx\n", txContext.txType);
THROW(0x6501);