arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-02 22:28:45 +00:00
Code Issues Releases Wiki Activity

layout2: refactor is_valid_ascii function

Browse Source
This commit is contained in:
Pavol Rusnak 2018-09-06 17:41:48 +02:00
parent a3555b9c7c
commit a6de54520d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/fsm_msg_coin.h
View File

@ -209,6 +209,8 @@ void fsm_msgGetAddress(GetAddress *msg)
void fsm_msgSignMessage(SignMessage *msg) void fsm_msgSignMessage(SignMessage *msg)
{ {
// CHECK_PARAM(is_ascii_only(msg->message.bytes, msg->message.size), _("Cannot sign non-ASCII strings"));
RESP_INIT(MessageSignature); RESP_INIT(MessageSignature);
CHECK_INITIALIZED CHECK_INITIALIZED

13
firmware/layout2.c
View File

@ -296,17 +296,20 @@ void layoutConfirmOutput(const CoinInfo *coin, const TxAck_TransactionType_TxOut
render_address_dialog(coin, address, _("Confirm sending"), str_out, extra_line); render_address_dialog(coin, address, _("Confirm sending"), str_out, extra_line);
} }
void layoutConfirmOpReturn(const uint8_t *data, uint32_t size) bool is_valid_ascii(const uint8_t *data, uint32_t size)
{ {
bool ascii_only = true;
for (uint32_t i = 0; i < size; i++) { for (uint32_t i = 0; i < size; i++) {
if (data[i] < ' ' || data[i] > '~') { if (data[i] < ' ' || data[i] > '~') {
ascii_only = false; return false;
break;
} }
} }
return true;
}
void layoutConfirmOpReturn(const uint8_t *data, uint32_t size)
{
const char **str; const char **str;
if (!ascii_only) { if (!is_valid_ascii(data, size)) {
char hex[65]; char hex[65];
memset(hex, 0, sizeof(hex)); memset(hex, 0, sizeof(hex));
data2hex(data, (size > 32) ? 32 : size, hex); data2hex(data, (size > 32) ? 32 : size, hex);

1
firmware/layout2.h
View File

@ -72,5 +72,6 @@ void layoutNEMLevy(const NEMSignTx_NEMMosaicCreation_NEMMosaicDefinition *defini
void layoutCosiCommitSign(const uint32_t *address_n, size_t address_n_count, const uint8_t *data, uint32_t len, bool final_sign); void layoutCosiCommitSign(const uint32_t *address_n, size_t address_n_count, const uint8_t *data, uint32_t len, bool final_sign);
const char **split_message(const uint8_t *msg, uint32_t len, uint32_t rowlen); const char **split_message(const uint8_t *msg, uint32_t len, uint32_t rowlen);
bool is_valid_ascii(const uint8_t *data, uint32_t size);
#endif #endif