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

EIP 155 support. Free up some RAM for U2F buffers

Browse Source
This commit is contained in:
BTChip
2016-11-25 09:10:04 +01:00
parent 050f482fe5
commit 54ea8ac82e
4 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src_common/ethUstream.c
View File

@@ -20,6 +20,7 @@
#define MAX_INT256 32
#define MAX_ADDRESS 20
#define MAX_V 2
void initTx(txContext_t *context, cx_sha3_t *sha3, txContent_t *content,
ustreamProcess_t customProcessor, void *extra) {
@@ -227,12 +228,44 @@ static void processData(txContext_t *context) {
}
}
static void processV(txContext_t *context) {
if (context->currentFieldIsList) {
screen_printf("Invalid type for RLP_V\n");
THROW(EXCEPTION);
}
if (context->currentFieldLength > MAX_V) {
screen_printf("Invalid length for RLP_V\n");
THROW(EXCEPTION);
}
if (context->currentFieldPos < context->currentFieldLength) {
uint32_t copySize =
(context->commandLength <
((context->currentFieldLength - context->currentFieldPos))
? context->commandLength
: context->currentFieldLength - context->currentFieldPos);
copyTxData(context, context->content->v + context->currentFieldPos,
copySize);
}
if (context->currentFieldPos == context->currentFieldLength) {
context->content->vLength = context->currentFieldLength;
context->currentField++;
context->processingField = false;
}
}
static parserStatus_e processTxInternal(txContext_t *context) {
for (;;) {
bool processedCustom = false;
// EIP 155 style transasction
if (context->currentField == TX_RLP_DONE) {
return USTREAM_FINISHED;
}
// Old style transaction
if ((context->currentField == TX_RLP_V) &&
(context->commandLength == 0)) {
context->content->vLength = 0;
return USTREAM_FINISHED;
}
if (context->commandLength == 0) {
return USTREAM_PROCESSING;
}
@@ -307,8 +340,13 @@ static parserStatus_e processTxInternal(txContext_t *context) {
processTo(context);
break;
case TX_RLP_DATA:
case TX_RLP_R:
case TX_RLP_S:
processData(context);
break;
case TX_RLP_V:
processV(context);
break;
default:
screen_printf("Invalid RLP decoder context\n");
return USTREAM_FAULT;

5
src_common/ethUstream.h
View File

@@ -32,6 +32,9 @@ typedef enum rlpTxField_e {
TX_RLP_TO,
TX_RLP_VALUE,
TX_RLP_DATA,
TX_RLP_V,
TX_RLP_R,
TX_RLP_S,
TX_RLP_DONE
} rlpTxField_e;
@@ -52,6 +55,8 @@ typedef struct txContent_t {
txInt256_t value;
uint8_t destination[20];
uint8_t destinationLength;
uint8_t v[2];
uint8_t vLength;
} txContent_t;
typedef struct txContext_t {