Merge pull request #186 from LedgerHQ/y333/remove_friction_blind_signing_ngl

Remove warning message when performing blind signing (NBGL)

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.15.4"
+version = "1.15.5"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true

ledger_device_sdk/Cargo.toml

@@ -6,7 +6,6 @@ use alloc::ffi::CString;
 use alloc::vec::Vec;
 use core::ffi::{c_char, c_int};
 use core::mem::transmute;
-use include_gif::include_gif;
 use ledger_secure_sdk_sys::*;
 
 #[no_mangle]
@@ -210,15 +209,12 @@ trait ToMessage {
 }
 
 impl TransactionType {
-    pub fn to_c_type(&self, blind: bool, skippable: bool) -> nbgl_operationType_t {
+    fn to_c_type(&self, skippable: bool) -> nbgl_operationType_t {
         let mut tx_type = match self {
             TransactionType::Transaction => TYPE_TRANSACTION.into(),
             TransactionType::Message => TYPE_MESSAGE.into(),
             TransactionType::Operation => TYPE_OPERATION.into(),
         };
-        if blind {
-            tx_type |= BLIND_OPERATION;
-        }
         if skippable {
             tx_type |= SKIPPABLE_OPERATION;
         }
@@ -267,35 +263,6 @@ pub fn init_comm(comm: &mut Comm) {
     }
 }
 
-/// Private helper function to display a warning screen when a transaction
-/// is reviewed in "blind" mode. The user can choose to go back to safety
-/// or review the risk. If the user chooses to review the risk, a second screen
-/// is displayed with the option to accept the risk or reject the transaction.
-/// Used in NbglReview and NbglStreamingReview.
-fn show_blind_warning() -> bool {
-    const WARNING: NbglGlyph =
-        NbglGlyph::from_include(include_gif!("icons/Warning_64px.gif", NBGL));
-
-    let back_to_safety = NbglChoice::new().glyph(&WARNING).show(
-        "Security risk detected",
-        "It may not be safe to sign this transaction. To continue, you'll need to review the risk.",
-        "Back to safety",
-        "Review risk",
-    );
-
-    if !back_to_safety {
-        NbglChoice::new()
-            .show(
-                "The transaction cannot be trusted",
-                "Your Ledger cannot decode this transaction. If you sign it, you could be authorizing malicious actions that can drain your wallet.\n\nLearn more: ledger.com/e8",
-                "I accept the risk",
-                "Reject transaction"
-            )
-    } else {
-        false
-    }
-}
-
 #[derive(Copy, Clone)]
 pub enum TuneIndex {
     Reserved,

ledger_device_sdk/src/nbgl.rs

@@ -90,23 +90,33 @@ impl<'a> NbglReview<'a> {
                 None => nbgl_icon_details_t::default(),
             };
 
-            if self.blind {
-                if !show_blind_warning() {
-                    return false;
-                }
-            }
-
             // Show the review on the device.
             self.ux_sync_init();
-            nbgl_useCaseReview(
-                self.tx_type.to_c_type(self.blind, false),
-                &tag_value_list as *const nbgl_contentTagValueList_t,
-                &icon as *const nbgl_icon_details_t,
-                self.title.as_ptr() as *const c_char,
-                self.subtitle.as_ptr() as *const c_char,
-                self.finish_title.as_ptr() as *const c_char,
-                Some(choice_callback),
-            );
+            match self.blind {
+                true => {
+                    nbgl_useCaseReviewBlindSigning(
+                        self.tx_type.to_c_type(false),
+                        &tag_value_list as *const nbgl_contentTagValueList_t,
+                        &icon as *const nbgl_icon_details_t,
+                        self.title.as_ptr() as *const c_char,
+                        self.subtitle.as_ptr() as *const c_char,
+                        self.finish_title.as_ptr() as *const c_char,
+                        core::ptr::null(),
+                        Some(choice_callback),
+                    );
+                }
+                false => {
+                    nbgl_useCaseReview(
+                        self.tx_type.to_c_type(false),
+                        &tag_value_list as *const nbgl_contentTagValueList_t,
+                        &icon as *const nbgl_icon_details_t,
+                        self.title.as_ptr() as *const c_char,
+                        self.subtitle.as_ptr() as *const c_char,
+                        self.finish_title.as_ptr() as *const c_char,
+                        Some(choice_callback),
+                    );
+                }
+            }
             let sync_ret = self.ux_sync_wait(false);
 
             // Return true if the user approved the transaction, false otherwise.

ledger_device_sdk/src/nbgl/nbgl_review.rs

@@ -42,20 +42,27 @@ impl NbglStreamingReview {
             let title = CString::new(title).unwrap();
             let subtitle = CString::new(subtitle).unwrap();
 
-            if self.blind {
-                if !show_blind_warning() {
-                    return false;
+            self.ux_sync_init();
+            match self.blind {
+                true => {
+                    nbgl_useCaseReviewStreamingBlindSigningStart(
+                        self.tx_type.to_c_type(false),
+                        &self.icon as *const nbgl_icon_details_t,
+                        title.as_ptr() as *const c_char,
+                        subtitle.as_ptr() as *const c_char,
+                        Some(choice_callback),
+                    );
+                }
+                false => {
+                    nbgl_useCaseReviewStreamingStart(
+                        self.tx_type.to_c_type(false),
+                        &self.icon as *const nbgl_icon_details_t,
+                        title.as_ptr() as *const c_char,
+                        subtitle.as_ptr() as *const c_char,
+                        Some(choice_callback),
+                    );
                 }
             }
-
-            self.ux_sync_init();
-            nbgl_useCaseReviewStreamingStart(
-                self.tx_type.to_c_type(self.blind, false),
-                &self.icon as *const nbgl_icon_details_t,
-                title.as_ptr() as *const c_char,
-                subtitle.as_ptr() as *const c_char,
-                Some(choice_callback),
-            );
             let sync_ret = self.ux_sync_wait(false);
 
             // Return true if the user approved the transaction, false otherwise.