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

Now uses some of the old EIP712 code as common code between the two implementations + approve/reject button now works

Browse Source
This commit is contained in:
Alexandre Paillier
2022-05-12 17:30:04 +02:00
parent 9f29a7caa2
commit 9cd39e2c02
10 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src_features/signMessageEIP712/eip712.h
View File

@@ -4,15 +4,6 @@
#include <stdbool.h>
#include <stdint.h>
enum {
OFFSET_CLA = 0,
OFFSET_INS,
OFFSET_P1,
OFFSET_P2,
OFFSET_LC,
OFFSET_DATA
};
typedef enum
{
// contract defined struct

32
src_features/signMessageEIP712/entrypoint.c
View File

@@ -3,6 +3,7 @@
#include <stdbool.h>
#include <string.h>
#include "apdu_constants.h"
#include "eip712.h"
#include "mem.h"
#include "type_hash.h"
@@ -12,6 +13,7 @@
#include "path.h"
#include "shared_context.h"
#include "ui_logic.h"
#include "common_712.h"
// lib functions
@@ -249,7 +251,7 @@ bool set_struct_name(const uint8_t *const data)
{
return false;
}
memmove(name_ptr, &data[OFFSET_DATA], data[OFFSET_LC]);
memmove(name_ptr, &data[OFFSET_CDATA], data[OFFSET_LC]);
// initialize number of fields
if ((current_struct_fields_array = mem_alloc(sizeof(uint8_t))) == NULL)
@@ -264,7 +266,7 @@ bool set_struct_name(const uint8_t *const data)
// TODO: Handle partial sends
bool set_struct_field(const uint8_t *const data)
{
uint8_t data_idx = OFFSET_DATA;
uint8_t data_idx = OFFSET_CDATA;
uint8_t *type_desc_ptr;
uint8_t *type_size_ptr;
uint8_t *typename_len_ptr;
@@ -403,16 +405,16 @@ bool handle_eip712_struct_impl(const uint8_t *const apdu_buf)
{
case P2_NAME:
// set root type
ret = path_set_root((char*)&apdu_buf[OFFSET_DATA],
ret = path_set_root((char*)&apdu_buf[OFFSET_CDATA],
apdu_buf[OFFSET_LC]);
break;
case P2_FIELD:
ret = field_hash(&apdu_buf[OFFSET_DATA],
ret = field_hash(&apdu_buf[OFFSET_CDATA],
apdu_buf[OFFSET_LC],
apdu_buf[OFFSET_P1] != P1_COMPLETE);
break;
case P2_ARRAY:
ret = path_new_array_depth(apdu_buf[OFFSET_DATA]);
ret = path_new_array_depth(apdu_buf[OFFSET_CDATA]);
break;
default:
PRINTF("Unknown P2 0x%x for APDU 0x%x\n",
@@ -432,22 +434,12 @@ bool handle_eip712_struct_impl(const uint8_t *const apdu_buf)
bool handle_eip712_sign(const uint8_t *const apdu_buf)
{
uint8_t i;
if (apdu_buf[OFFSET_LC] < 1) {
PRINTF("Invalid data\n");
THROW(0x6a80);
if (parseBip32(&apdu_buf[OFFSET_CDATA],
&apdu_buf[OFFSET_LC],
&tmpCtx.messageSigningContext.bip32) == NULL)
{
return false;
}
tmpCtx.messageSigningContext712.pathLength = apdu_buf[OFFSET_DATA];
if ((tmpCtx.messageSigningContext712.pathLength < 0x01) ||
(tmpCtx.messageSigningContext712.pathLength > MAX_BIP32_PATH)) {
PRINTF("Invalid path\n");
THROW(0x6a80);
}
for (i = 0; i < tmpCtx.messageSigningContext712.pathLength; i++) {
tmpCtx.messageSigningContext712.bip32Path[i] = U4BE(apdu_buf + OFFSET_LC + 1 + (i * 4), 0);
}
ui_712_end_sign();
return true;
}

5
src_features/signMessageEIP712/ui_flow_712.c
View File

@@ -1,6 +1,7 @@
#include "ui_flow_712.h"
#include "ui_logic.h"
#include "shared_context.h" // strings
#include "common_712.h"
// clang-format off
UX_STEP_NOCB(
@@ -30,7 +31,7 @@ UX_STEP_INIT(
UX_STEP_CB(
ux_712_step_approve,
pb,
NULL,//io_seproxyhal_touch_signMessage712_ok(NULL),
ui_712_approve_cb(NULL),
{
&C_icon_validate_14,
"Approve",
@@ -38,7 +39,7 @@ UX_STEP_CB(
UX_STEP_CB(
ux_712_step_reject,
pb,
NULL,//io_seproxyhal_touch_signMessage712_cancel(NULL),
ui_712_reject_cb(NULL),
{
&C_icon_crossmark,
"Reject",