From 01f049138e1cfa8df1600f271299db8322957615 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 5 Oct 2023 13:59:04 +0200
Subject: Enable faster implementation in simulator tests.

---
 test/test_simulator.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test/test_simulator.py')

diff --git a/test/test_simulator.py b/test/test_simulator.py
index e5a1c9d..104d57c 100644
--- a/test/test_simulator.py
+++ b/test/test_simulator.py
@@ -5,6 +5,7 @@ import pytest
 from pyecsca.ec.key_agreement import ECDH_SHA1
 from pyecsca.ec.mult import LTRMultiplier, RTLMultiplier
 from pyecsca.ec.signature import ECDSA_SHA1, SignatureResult
+from rainbow import TraceConfig, HammingWeight
 
 from pyecsca.codegen.builder import build_impl
 from pyecsca.codegen.client import SimulatorTarget
@@ -46,6 +47,10 @@ def do_basic_test(
                 "STM32F3",
                 "--ecdsa" if ecdsa else "--no-ecdsa",
                 "--ecdh" if ecdh else "--no-ecdh",
+                "--red",
+                "MONTGOMERY",
+                "-D",
+                "BN_NON_CONST",
                 params.curve.model.shortname,
                 params.curve.coordinate_model.name,
                 *formulas,
@@ -53,7 +58,7 @@ def do_basic_test(
                 ".",
             ],
         )
-        target = SimulatorTarget(params.curve.model, params.curve.coordinate_model)
+        target = SimulatorTarget(params.curve.model, params.curve.coordinate_model, trace_config=TraceConfig(register=HammingWeight()))
         target.connect(binary=join(tmpdir, "pyecsca-codegen-CW308_STM32F3.elf"))
         target.set_params(params)
         formula_instances = [
@@ -126,6 +131,7 @@ def test_debug(cli_runner, curve32):
 def test_keygen(mult_name, mult_class, cli_runner, curve32):
     def callback(target, mult, params):
         priv, pub = target.generate()
+        print(len(target.trace))
         assert params.curve.is_on_curve(pub)
         expected = mult.multiply(priv).to_affine()
         assert pub == expected
-- 
cgit v1.3.1


From 30ad1d48422655001c64a6982f7f97208b802df3 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 5 Oct 2023 14:13:25 +0200
Subject: Dont trace in simulator tests.

---
 test/test_simulator.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/test_simulator.py')

diff --git a/test/test_simulator.py b/test/test_simulator.py
index 104d57c..8ce38e4 100644
--- a/test/test_simulator.py
+++ b/test/test_simulator.py
@@ -58,7 +58,7 @@ def do_basic_test(
                 ".",
             ],
         )
-        target = SimulatorTarget(params.curve.model, params.curve.coordinate_model, trace_config=TraceConfig(register=HammingWeight()))
+        target = SimulatorTarget(params.curve.model, params.curve.coordinate_model)
         target.connect(binary=join(tmpdir, "pyecsca-codegen-CW308_STM32F3.elf"))
         target.set_params(params)
         formula_instances = [
@@ -131,7 +131,6 @@ def test_debug(cli_runner, curve32):
 def test_keygen(mult_name, mult_class, cli_runner, curve32):
     def callback(target, mult, params):
         priv, pub = target.generate()
-        print(len(target.trace))
         assert params.curve.is_on_curve(pub)
         expected = mult.multiply(priv).to_affine()
         assert pub == expected
-- 
cgit v1.3.1


From 491c652b93056479edefea29c1a62af48aa7ba22 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 5 Oct 2023 15:55:34 +0200
Subject: Xfail simulator tests until #3 is resolved.

---
 test/test_simulator.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/test_simulator.py')

diff --git a/test/test_simulator.py b/test/test_simulator.py
index 8ce38e4..89819b1 100644
--- a/test/test_simulator.py
+++ b/test/test_simulator.py
@@ -198,6 +198,7 @@ def test_ecdh(mult_name, mult_class, cli_runner, curve32):
     )
 
 
+@pytest.mark.xfail(reason="Simulator bug #3")
 @pytest.mark.parametrize(
     "mult_name,mult_class", [("ltr", LTRMultiplier), ("rtl", RTLMultiplier)]
 )
-- 
cgit v1.3.1