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

Add upper bound for withdrawal index

Browse Source
This commit is contained in:
pscott
2021-04-22 10:08:05 +02:00
parent de0f449204
commit 6ff2172f1b
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src_features/getEth2PublicKey/cmd_getEth2PublicKey.c
View File

@@ -19,7 +19,7 @@ void getEth2PublicKey(uint32_t *bip32Path, uint8_t bip32PathLength, uint8_t *out
uint8_t tmp[96]; uint8_t tmp[96];
io_seproxyhal_io_heartbeat(); io_seproxyhal_io_heartbeat();
os_perso_derive_eip2333(CX_CURVE_BLS12_381_G1, bip32Path, bip32PathLength, privateKeyData); // os_perso_derive_eip2333(CX_CURVE_BLS12_381_G1, bip32Path, bip32PathLength, privateKeyData);
io_seproxyhal_io_heartbeat(); io_seproxyhal_io_heartbeat();
memset(tmp, 0, 48); memset(tmp, 0, 48);
memmove(tmp + 16, privateKeyData, 32); memmove(tmp + 16, privateKeyData, 32);

4
src_features/setEth2WithdrawalIndex/cmd_setEth2WithdrawalIndex.c
View File

@@ -2,6 +2,7 @@
#include "shared_context.h" #include "shared_context.h"
#include "apdu_constants.h" #include "apdu_constants.h"
#include "withdrawal_index.h"
void handleSetEth2WithdrawalIndex(uint8_t p1, void handleSetEth2WithdrawalIndex(uint8_t p1,
uint8_t p2, uint8_t p2,
@@ -18,6 +19,9 @@ void handleSetEth2WithdrawalIndex(uint8_t p1,
} }
eth2WithdrawalIndex = U4BE(dataBuffer, 0); eth2WithdrawalIndex = U4BE(dataBuffer, 0);
if (eth2WithdrawalIndex > INDEX_MAX) {
THROW(0x6A80); // scott throw this error code or create new one ?
}
THROW(0x9000); THROW(0x9000);
} }

2
src_features/setEth2WithdrawalIndex/withdrawal_index.h
View File

@@ -1,5 +1,7 @@
#include "stdint.h" #include "stdint.h"
#define INDEX_MAX 1337 // scott
void handleSetEth2WithdrawalIndex(uint8_t p1, void handleSetEth2WithdrawalIndex(uint8_t p1,
uint8_t p2, uint8_t p2,
uint8_t *dataBuffer, uint8_t *dataBuffer,

6
src_plugins/eth2/eth2_plugin.c
View File

@@ -6,6 +6,7 @@
#include "shared_context.h" #include "shared_context.h"
#include "ethUtils.h" #include "ethUtils.h"
#include "utils.h" #include "utils.h"
#include "withdrawal_index.h"
void getEth2PublicKey(uint32_t *bip32Path, uint8_t bip32PathLength, uint8_t *out); void getEth2PublicKey(uint32_t *bip32Path, uint8_t bip32PathLength, uint8_t *out);
@@ -98,6 +99,11 @@ void eth2_plugin_call(int message, void *parameters) {
uint32_t withdrawalKeyPath[4]; uint32_t withdrawalKeyPath[4];
withdrawalKeyPath[0] = WITHDRAWAL_KEY_PATH_1; withdrawalKeyPath[0] = WITHDRAWAL_KEY_PATH_1;
withdrawalKeyPath[1] = WITHDRAWAL_KEY_PATH_2; withdrawalKeyPath[1] = WITHDRAWAL_KEY_PATH_2;
if (eth2WithdrawalIndex > INDEX_MAX) {
PRINTF("eth2 plugin eth2 withdrawal index is too big\n");
PRINTF("Got %u which is higher than INDEX_MAX (%u)\n", eth2WithdrawalIndex, INDEX_MAX);
context->valid = 0;
}
withdrawalKeyPath[2] = eth2WithdrawalIndex; withdrawalKeyPath[2] = eth2WithdrawalIndex;
withdrawalKeyPath[3] = WITHDRAWAL_KEY_PATH_4; withdrawalKeyPath[3] = WITHDRAWAL_KEY_PATH_4;
getEth2PublicKey(withdrawalKeyPath, 4, tmp); getEth2PublicKey(withdrawalKeyPath, 4, tmp);