arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-03 11:20:59 +00:00
Code Issues Releases Wiki Activity

Ask for confirmation on ECDH Session (gpg decrypt)

Browse Source 
Also fix abort to send a reply (a cancel failure)
This commit is contained in:
Jochen Hoenicke 2016-07-14 18:11:20 +02:00
parent b95f785701
commit 7d8cb9018e
No known key found for this signature in database
GPG Key ID: 65B10C0466560648
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/fsm.c
View File

@ -424,6 +424,7 @@ void fsm_msgCancel(Cancel *msg)
(void)msg; (void)msg;
recovery_abort(); recovery_abort();
signing_abort(); signing_abort();
fsm_sendFailure(FailureType_Failure_ActionCancelled, "Aborted");
} }
void fsm_msgTxAck(TxAck *msg) void fsm_msgTxAck(TxAck *msg)
@ -807,6 +808,13 @@ void fsm_msgGetECDHSessionKey(GetECDHSessionKey *msg)
return; return;
} }
layoutDecryptIdentity(&msg->identity);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
fsm_sendFailure(FailureType_Failure_ActionCancelled, "ECDH Session cancelled");
layoutHome();
return;
}
if (!protectPin(true)) { if (!protectPin(true)) {
layoutHome(); layoutHome();
return; return;

42
firmware/layout2.c
View File

@ -336,6 +336,48 @@ void layoutSignIdentity(const IdentityType *identity, const char *challenge)
NULL); NULL);
} }
void layoutDecryptIdentity(const IdentityType *identity)
{
char row_proto[8 + 11 + 1];
char row_hostport[64 + 6 + 1];
char row_user[64 + 8 + 1];
if (identity->has_proto && identity->proto[0]) {
strlcpy(row_proto, identity->proto, sizeof(row_proto));
char *p = row_proto;
while (*p) { *p = toupper((int)*p); p++; }
strlcat(row_proto, " decrypt for:", sizeof(row_proto));
} else {
strlcpy(row_proto, "Decrypt for:", sizeof(row_proto));
}
if (identity->has_host && identity->host[0]) {
strlcpy(row_hostport, identity->host, sizeof(row_hostport));
if (identity->has_port && identity->port[0]) {
strlcat(row_hostport, ":", sizeof(row_hostport));
strlcat(row_hostport, identity->port, sizeof(row_hostport));
}
} else {
row_hostport[0] = 0;
}
if (identity->has_user && identity->user[0]) {
strlcpy(row_user, "user: ", sizeof(row_user));
strlcat(row_user, identity->user, sizeof(row_user));
} else {
row_user[0] = 0;
}
layoutDialogSwipe(&bmp_icon_question, "Cancel", "Confirm",
"Do you want to decrypt?",
row_proto[0] ? row_proto : NULL,
row_hostport[0] ? row_hostport : NULL,
row_user[0] ? row_user : NULL,
NULL,
NULL,
NULL);
}
void layoutU2FDialog(const char *verb, const char *appname, const BITMAP *appicon) { void layoutU2FDialog(const char *verb, const char *appname, const BITMAP *appicon) {
if (!appicon) { if (!appicon) {
appicon = &bmp_icon_question; appicon = &bmp_icon_question;

1
firmware/layout2.h
View File

@ -41,6 +41,7 @@ void layoutDecryptMessage(const uint8_t *msg, uint32_t len, const char *address)
void layoutAddress(const char *address, const char *desc); void layoutAddress(const char *address, const char *desc);
void layoutPublicKey(const uint8_t *pubkey); void layoutPublicKey(const uint8_t *pubkey);
void layoutSignIdentity(const IdentityType *identity, const char *challenge); void layoutSignIdentity(const IdentityType *identity, const char *challenge);
void layoutDecryptIdentity(const IdentityType *identity);
void layoutU2FDialog(const char *verb, const char *appname, const BITMAP *appicon); void layoutU2FDialog(const char *verb, const char *appname, const BITMAP *appicon);
#endif #endif