Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove useless flag NO_CONSENT #577

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Remove useless flag NO_CONSENT #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions makefile_conf/features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ ifneq ($(TARGET_NAME),TARGET_NANOS)
endif
endif

ifneq ($(NOCONSENT),)
DEFINES += NO_CONSENT
endif

# Check features incompatibilities
# --------------------------------
# NFTs
Expand Down
10 changes: 2 additions & 8 deletions src_features/getEth2PublicKey/cmd_getEth2PublicKey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,14 @@ void handleGetEth2PublicKey(uint8_t p1,

getEth2PublicKey(bip32.path, bip32.length, tmpCtx.publicKeyContext.publicKey.W);

#ifndef NO_CONSENT
if (p1 == P1_NON_CONFIRM)
#endif // NO_CONSENT
{
if (p1 == P1_NON_CONFIRM) {
*tx = set_result_get_eth2_publicKey();
THROW(0x9000);
}
#ifndef NO_CONSENT
else {
} else {
ui_display_public_eth2();

*flags |= IO_ASYNCH_REPLY;
}
#endif // NO_CONSENT
}

#endif
10 changes: 2 additions & 8 deletions src_features/getPublicKey/cmd_getPublicKey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,10 @@ void handleGetPublicKey(uint8_t p1,
THROW(APDU_RESPONSE_INVALID_DATA);
}

#ifndef NO_CONSENT
if (p1 == P1_NON_CONFIRM)
#endif // NO_CONSENT
{
if (p1 == P1_NON_CONFIRM) {
*tx = set_result_get_publicKey();
THROW(APDU_RESPONSE_OK);
}
#ifndef NO_CONSENT
else {
} else {
snprintf(strings.common.fullAddress,
sizeof(strings.common.fullAddress),
"0x%.*s",
Expand All @@ -79,5 +74,4 @@ void handleGetPublicKey(uint8_t p1,

*flags |= IO_ASYNCH_REPLY;
}
#endif // NO_CONSENT
}
10 changes: 2 additions & 8 deletions src_features/performPrivacyOperation/cmd_performPrivacyOperation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,10 @@ void handlePerformPrivacyOperation(uint8_t p1,
THROW(0x6A80);
}

#ifndef NO_CONSENT
if (p1 == P1_NON_CONFIRM)
#endif // NO_CONSENT
{
if (p1 == P1_NON_CONFIRM) {
*tx = set_result_perform_privacy_operation();
THROW(0x9000);
}
#ifndef NO_CONSENT
else {
} else {
snprintf(strings.common.fullAddress,
sizeof(strings.common.fullAddress),
"0x%.*s",
Expand All @@ -120,5 +115,4 @@ void handlePerformPrivacyOperation(uint8_t p1,

*flags |= IO_ASYNCH_REPLY;
}
#endif // NO_CONSENT
}
4 changes: 0 additions & 4 deletions src_features/signMessage/cmd_signMessage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,7 @@ bool handleSignPersonalMessage(uint8_t p1,
} else // hash only
{
if (tmpCtx.messageSigningContext.remainingLength == 0) {
#ifdef NO_CONSENT
io_seproxyhal_touch_signMessage_ok();
#else
ui_191_switch_to_sign();
#endif
} else {
apdu_reply(APDU_RESPONSE_OK);
}
Expand Down
4 changes: 0 additions & 4 deletions src_features/signMessageEIP712_v0/cmd_signMessage712.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ void handleSignEIP712Message_v0(uint8_t p1,
workBuffer + KECCAK256_HASH_BYTESIZE,
KECCAK256_HASH_BYTESIZE);

#ifdef NO_CONSENT
io_seproxyhal_touch_signMessage_ok(NULL);
#else // NO_CONSENT
ui_sign_712_v0();
#endif // NO_CONSENT

*flags |= IO_ASYNCH_REPLY;
}
9 changes: 1 addition & 8 deletions src_features/signTx/logic_signTx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,20 +535,13 @@ __attribute__((noinline)) static bool finalize_parsing_helper(bool direct, bool

void finalizeParsing(bool direct) {
bool use_standard_UI = true;
bool no_consent_check;

if (!finalize_parsing_helper(direct, &use_standard_UI)) {
return;
}
// If called from swap, the user has already validated a standard transaction
// And we have already checked the fields of this transaction above
no_consent_check = G_called_from_swap && use_standard_UI;

#ifdef NO_CONSENT
no_consent_check = true;
#endif // NO_CONSENT

if (no_consent_check) {
if (G_called_from_swap && use_standard_UI) {
io_seproxyhal_touch_tx_ok(NULL);
} else {
if (use_standard_UI) {
Expand Down
Loading