arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-29 10:58:21 +00:00
Code Issues Releases Wiki Activity

stellar: check return value for stellar_deriveNode

Browse Source
This commit is contained in:
Pavol Rusnak 2018-10-23 14:15:26 +02:00
parent 5cbeb970c9
commit cc630a1ebb
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/fsm_msg_stellar.h
View File

@ -25,7 +25,7 @@ void fsm_msgStellarGetAddress(const StellarGetAddress *msg)
CHECK_PIN
HDNode *node = stellar_deriveNode(msg->address_n, msg->address_n_count);
const HDNode *node = stellar_deriveNode(msg->address_n, msg->address_n_count);
if (!node) {
fsm_sendFailure(FailureType_Failure_ProcessError, _("Failed to derive private key"));
return;
@ -60,7 +60,11 @@ void fsm_msgStellarSignTx(const StellarSignTx *msg)
CHECK_INITIALIZED
CHECK_PIN
stellar_signingInit(msg);
if (!stellar_signingInit(msg)) {
fsm_sendFailure(FailureType_Failure_ProcessError, _("Failed to derive private key"));
layoutHome();
return;
}
// Confirm transaction basics
stellar_layoutTransactionSummary(msg);

26
firmware/stellar.c
View File

@ -52,7 +52,7 @@ static StellarTransaction stellar_activeTx;
/*
* Starts the signing process and parses the transaction header
*/
void stellar_signingInit(const StellarSignTx *msg)
bool stellar_signingInit(const StellarSignTx *msg)
{
memset(&stellar_activeTx, 0, sizeof(StellarTransaction));
stellar_signing = true;
@ -78,10 +78,9 @@ void stellar_signingInit(const StellarSignTx *msg)
stellar_hashupdate_bytes(tx_type_bytes, sizeof(tx_type_bytes));
// Public key comes from deriving the specified account path
HDNode *node = stellar_deriveNode(msg->address_n, msg->address_n_count);
const HDNode *node = stellar_deriveNode(msg->address_n, msg->address_n_count);
if (!node) {
// TODO: bail on error
return;
return false;
}
memcpy(&(stellar_activeTx.signing_pubkey), node->public_key + 1, sizeof(stellar_activeTx.signing_pubkey));
@ -153,6 +152,8 @@ void stellar_signingInit(const StellarSignTx *msg)
else {
stellar_activeTx.network_type = 3;
}
return true;
}
bool stellar_confirmSourceAccount(bool has_source_account, const char *str_account)
@ -1229,7 +1230,12 @@ bool stellar_allOperationsConfirmed()
*/
void stellar_getSignatureForActiveTx(uint8_t *out_signature)
{
HDNode *node = stellar_deriveNode(stellar_activeTx.address_n, stellar_activeTx.address_n_count);
const HDNode *node = stellar_deriveNode(stellar_activeTx.address_n, stellar_activeTx.address_n_count);
if (!node) {
// return empty signature when we can't derive node
memset(out_signature, 0, 64);
return;
}
// Signature is the ed25519 detached signature of the sha256 of all the bytes
// that have been read so far
@ -1497,7 +1503,7 @@ uint16_t stellar_crc16(uint8_t *bytes, uint32_t length)
*
* All paths must be hardened
*/
HDNode *stellar_deriveNode(const uint32_t *address_n, size_t address_n_count)
const HDNode *stellar_deriveNode(const uint32_t *address_n, size_t address_n_count)
{
static CONFIDENTIAL HDNode node;
const char *curve = "ed25519";
@ -1564,7 +1570,7 @@ void stellar_hashupdate_bool(bool value)
}
}
void stellar_hashupdate_string(uint8_t *data, size_t len)
void stellar_hashupdate_string(const uint8_t *data, size_t len)
{
// Hash the length of the string
stellar_hashupdate_uint32((uint32_t)len);
@ -1583,7 +1589,7 @@ void stellar_hashupdate_string(uint8_t *data, size_t len)
}
}
void stellar_hashupdate_address(uint8_t *address_bytes)
void stellar_hashupdate_address(const uint8_t *address_bytes)
{
// First 4 bytes of an address are the type. There's only one type (0)
stellar_hashupdate_uint32(0);
@ -1799,9 +1805,9 @@ void stellar_layoutSigningDialog(const char *line1, const char *line2, const cha
int offset_y = 1;
int line_height = 9;
HDNode *node = stellar_deriveNode(address_n, address_n_count);
const HDNode *node = stellar_deriveNode(address_n, address_n_count);
if (!node) {
// TODO: bail on error
// abort on error
return;
}

8
firmware/stellar.h
View File

@ -53,7 +53,7 @@ typedef struct {
} StellarTransaction;
// Signing process
void stellar_signingInit(const StellarSignTx *tx);
bool stellar_signingInit(const StellarSignTx *tx);
void stellar_signingAbort(const char *reason);
bool stellar_confirmSourceAccount(bool has_source_account, const char *str_account);
bool stellar_confirmCreateAccountOp(const StellarCreateAccountOp *msg);
@ -74,7 +74,7 @@ void stellar_layoutTransactionSummary(const StellarSignTx *msg);
void stellar_layoutSigningDialog(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, uint32_t *address_n, size_t address_n_count, const char *warning, bool is_final_step);
// Helpers
HDNode *stellar_deriveNode(const uint32_t *address_n, size_t address_n_count);
const HDNode *stellar_deriveNode(const uint32_t *address_n, size_t address_n_count);
size_t stellar_publicAddressAsStr(const uint8_t *bytes, char *out, size_t outlen);
const char **stellar_lineBreakAddress(const uint8_t *addrbytes);
@ -82,8 +82,8 @@ const char **stellar_lineBreakAddress(const uint8_t *addrbytes);
void stellar_hashupdate_uint32(uint32_t value);
void stellar_hashupdate_uint64(uint64_t value);
void stellar_hashupdate_bool(bool value);
void stellar_hashupdate_string(uint8_t *data, size_t len);
void stellar_hashupdate_address(uint8_t *address_bytes);
void stellar_hashupdate_string(const uint8_t *data, size_t len);
void stellar_hashupdate_address(const uint8_t *address_bytes);
void stellar_hashupdate_asset(const StellarAssetType *asset);
void stellar_hashupdate_bytes(const uint8_t *data, size_t len);