Merge commit '6199033' into HEAD

Author: BitHighlander

scripts/generate-test-report.py

@@ -646,6 +646,16 @@ def parse_junit(path):
           '0x swap ETH to ERC-20', 'DEX aggregator swap via 0x protocol.', []),
          ('E15', 'test_msg_ethereum_cfunc', 'test_sign_execTx',
           'Contract function call', 'Generic contract call signing.', []),
+         ('E16', 'test_msg_ethereum_signtx', 'test_ethereum_blind_sign_blocked',
+          'Blind sign BLOCKED (AdvancedMode OFF)',
+          'Contract data with AdvancedMode disabled. Device shows BLOCKED screen and refuses to sign. '
+          'This is the default behavior — blind signing must be explicitly enabled.',
+          ['BLOCKED screen']),
+         ('E17', 'test_msg_ethereum_signtx', 'test_ethereum_blind_sign_allowed',
+          'Blind sign ALLOWED (AdvancedMode ON)',
+          'Contract data with AdvancedMode enabled. Device shows BLIND SIGNATURE warning '
+          'before proceeding. User sees raw data and must explicitly confirm.',
+          ['BLIND SIGNATURE warning']),
      ]),
 
     ('R', 'Ripple (XRP)', '7.0.0',

tests/test_msg_ethereum_signtx.py

@@ -59,6 +59,7 @@ def test_ethereum_signtx_data(self):
         with self.client:
             self.client.set_expected_responses(
                 [
+                    proto.ButtonRequest(code=proto_types.ButtonRequest_Other),  # BLIND SIGNATURE warning
                     proto.ButtonRequest(code=proto_types.ButtonRequest_ConfirmOutput),
                     proto.ButtonRequest(code=proto_types.ButtonRequest_ConfirmOutput),
                     proto.ButtonRequest(code=proto_types.ButtonRequest_SignTx),
@@ -106,6 +107,53 @@ def test_ethereum_signtx_data(self):
 
         self.client.apply_policy("AdvancedMode", 0)
 
+    def test_ethereum_blind_sign_blocked(self):
+        """AdvancedMode OFF + contract data = device refuses to sign.
+
+        OLED shows 'BLOCKED — Blind signing is disabled' before returning Failure.
+        This is the default behavior — users must explicitly enable AdvancedMode.
+        """
+        self.requires_fullFeature()
+        self.setup_mnemonic_nopin_nopassphrase()
+        self.client.apply_policy("AdvancedMode", 0)
+
+        try:
+            self.client.ethereum_sign_tx(
+                n=[0, 0],
+                nonce=0,
+                gas_price=20,
+                gas_limit=20,
+                to=binascii.unhexlify("1d1c328764a41bda0492b66baa30c4a339ff85ef"),
+                value=0,
+                data=b"abcdefghijklmnop" * 16,
+            )
+            self.fail("Expected Failure — blind signing should be blocked")
+        except CallException as e:
+            self.assertIn("Blind signing disabled", str(e))
+
+    def test_ethereum_blind_sign_allowed(self):
+        """AdvancedMode ON + contract data = device shows BLIND SIGNATURE warning.
+
+        OLED shows 'BLIND SIGNATURE — You are signing raw contract data'
+        before showing the data and allowing signing.
+        """
+        self.requires_fullFeature()
+        self.setup_mnemonic_nopin_nopassphrase()
+        self.client.apply_policy("AdvancedMode", 1)
+
+        sig_v, sig_r, sig_s = self.client.ethereum_sign_tx(
+            n=[0, 0],
+            nonce=0,
+            gas_price=20,
+            gas_limit=20,
+            to=binascii.unhexlify("1d1c328764a41bda0492b66baa30c4a339ff85ef"),
+            value=0,
+            data=b"abcdefghijklmnop" * 16,
+        )
+        # Should succeed — AdvancedMode allows blind signing
+        self.assertIsNotNone(sig_v)
+        self.client.apply_policy("AdvancedMode", 0)
+
     def test_ethereum_signtx_message(self):
         self.requires_fullFeature()
         self.setup_mnemonic_nopin_nopassphrase()