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

Fix NBGL EIP-712 v0

Browse Source 
Was using the streaming review use case when it did not have to
This commit is contained in:
Alexandre Paillier
2024-05-23 14:36:34 +02:00
parent 78c1c885af
commit 7ad2e89d23
1 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src_nbgl/ui_sign_712_v0.c
View File

@@ -1,19 +1,19 @@
#include <string.h> // explicit_bzero
#include "os_utils.h" // ARRAYLEN
#include "common_ui.h" #include "common_ui.h"
#include "ui_nbgl.h" #include "ui_nbgl.h"
#include "common_712.h" #include "common_712.h"
#include "network.h"
#include "ui_message_signing.h" #include "ui_message_signing.h"
#include "ui_signing.h" #include "ui_signing.h"
#include "uint_common.h"
static nbgl_contentTagValue_t pairs[2]; static nbgl_contentTagValue_t pairs[2];
static nbgl_contentTagValueList_t pairsList; static nbgl_contentTagValueList_t pairsList;
static void messageReviewChoice_cb(bool confirm) { static void message_review_choice(bool confirm) {
if (confirm) { if (confirm) {
nbgl_useCaseStatus("MESSAGE\nSIGNED", true, ui_message_712_approved); nbgl_useCaseReviewStatus(STATUS_TYPE_MESSAGE_SIGNED, ui_message_712_approved);
} else { } else {
nbgl_useCaseStatus("Message signing\ncancelled", false, ui_message_712_rejected); nbgl_useCaseReviewStatus(STATUS_TYPE_MESSAGE_REJECTED, ui_message_712_rejected);
} }
} }
@@ -22,7 +22,7 @@ static char *format_hash(const uint8_t *hash, char *buffer, size_t buffer_size,
return buffer + offset; return buffer + offset;
} }
static void setTagValuePairs(void) { void ui_sign_712_v0(void) {
explicit_bzero(pairs, sizeof(pairs)); explicit_bzero(pairs, sizeof(pairs));
explicit_bzero(&pairsList, sizeof(pairsList)); explicit_bzero(&pairsList, sizeof(pairsList));
@@ -37,34 +37,15 @@ static void setTagValuePairs(void) {
sizeof(strings.tmp.tmp), sizeof(strings.tmp.tmp),
70); 70);
pairsList.nbPairs = 2; pairsList.nbPairs = ARRAYLEN(pairs);
pairsList.pairs = pairs; pairsList.pairs = pairs;
pairsList.smallCaseForValue = false; pairsList.nbMaxLinesForValue = 0;
pairsList.nbMaxLinesForValue = NB_MAX_LINES_IN_REVIEW;
pairsList.wrapping = false;
}
static void more_data_cb(bool confirm) { nbgl_useCaseReview(TYPE_MESSAGE,
if (confirm) { &pairsList,
if (g_position != UI_SIGNING_POSITION_SIGN) { &C_Review_64px,
setTagValuePairs(); TEXT_REVIEW_EIP712,
nbgl_useCaseReviewStreamingContinue(&pairsList, more_data_cb); NULL,
// Switch to signature TEXT_SIGN_EIP712,
g_position = UI_SIGNING_POSITION_SIGN; message_review_choice);
} else {
// the last page must contain a long press button
nbgl_useCaseReviewStreamingFinish(TEXT_SIGN_EIP712, messageReviewChoice_cb);
}
} else {
ui_message_712_rejected();
}
}
void ui_sign_712_v0(void) {
g_position = UI_SIGNING_POSITION_START;
nbgl_useCaseReviewStreamingStart(TYPE_MESSAGE,
&C_Review_64px,
TEXT_REVIEW_EIP712,
NULL,
more_data_cb);
} }