Fixes for scalarmult.

2 files changed, 8 insertions, 2 deletions

diff --git a/pyecsca/ec/mult.py b/pyecsca/ec/mult.py
index bfaa962..7a8e23e 100644
--- a/pyecsca/ec/mult.py
+++ b/pyecsca/ec/mult.py
@@ -241,7 +241,7 @@ class LadderMultiplier(ScalarMultiplier):
                  complete: bool = True, short_circuit: bool = True):
         super().__init__(short_circuit=short_circuit, ladd=ladd, dbl=dbl, scl=scl)
         self.complete = complete
-        if not complete and dbl is None:
+        if (not complete or short_circuit) and dbl is None:
             raise ValueError
 
     def multiply(self, scalar: int) -> Point:
diff --git a/pyecsca/ec/point.py b/pyecsca/ec/point.py
index a77332f..4484626 100644
--- a/pyecsca/ec/point.py
+++ b/pyecsca/ec/point.py
@@ -63,7 +63,13 @@ class Point(object):
             result = {}
             locals = {**self.coords}
             for op in ops:
-                locals[op.result] = op(**locals)
+                try:
+                    locals[op.result] = op(**locals)
+                except NameError as e:
+                    if op.result in affine_model.variables:
+                        raise e
+                    else:
+                        continue
                 if op.result in affine_model.variables:
                     result[op.result] = locals[op.result]
             return action.exit(Point(affine_model, **result))