aboutsummaryrefslogtreecommitdiff
path: root/test/ec/test_point.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/ec/test_point.py')
-rw-r--r--test/ec/test_point.py54
1 files changed, 27 insertions, 27 deletions
diff --git a/test/ec/test_point.py b/test/ec/test_point.py
index 9513840..f83cc14 100644
--- a/test/ec/test_point.py
+++ b/test/ec/test_point.py
@@ -2,7 +2,7 @@ import pickle
from contextlib import nullcontext as does_not_raise
from pyecsca.ec.coordinates import AffineCoordinateModel
from pyecsca.ec.params import get_params
-from pyecsca.ec.mod import Mod
+from pyecsca.ec.mod import Mod, mod
from pyecsca.ec.model import ShortWeierstrassModel, MontgomeryModel
from pyecsca.ec.point import Point, InfinityPoint
import pytest
@@ -28,9 +28,9 @@ def test_construction(secp128r1_coords):
def test_to_affine(secp128r1, secp128r1_coords, affine_model):
pt = Point(
secp128r1_coords,
- X=Mod(0x161FF7528B899B2D0C28607CA52C5B86, secp128r1.curve.prime),
- Y=Mod(0xCF5AC8395BAFEB13C02DA292DDED7A83, secp128r1.curve.prime),
- Z=Mod(1, secp128r1.curve.prime),
+ X=mod(0x161FF7528B899B2D0C28607CA52C5B86, secp128r1.curve.prime),
+ Y=mod(0xCF5AC8395BAFEB13C02DA292DDED7A83, secp128r1.curve.prime),
+ Z=mod(1, secp128r1.curve.prime),
)
affine = pt.to_affine()
@@ -55,8 +55,8 @@ def test_to_affine(secp128r1, secp128r1_coords, affine_model):
def test_to_model(secp128r1, secp128r1_coords, affine_model):
affine = Point(
affine_model,
- x=Mod(0xABCD, secp128r1.curve.prime),
- y=Mod(0xEF, secp128r1.curve.prime),
+ x=mod(0xABCD, secp128r1.curve.prime),
+ y=mod(0xEF, secp128r1.curve.prime),
)
other = affine.to_model(secp128r1_coords, secp128r1.curve)
@@ -64,7 +64,7 @@ def test_to_model(secp128r1, secp128r1_coords, affine_model):
assert set(other.coords.keys()) == set(secp128r1_coords.variables)
assert other.coords["X"] == affine.coords["x"]
assert other.coords["Y"] == affine.coords["y"]
- assert other.coords["Z"] == Mod(1, secp128r1.curve.prime)
+ assert other.coords["Z"] == mod(1, secp128r1.curve.prime)
infty = InfinityPoint(AffineCoordinateModel(secp128r1.curve.model))
other_infty = infty.to_model(secp128r1_coords, secp128r1.curve)
@@ -101,21 +101,21 @@ def test_to_from_affine(category, curve, coords, raises):
def test_equals(secp128r1, secp128r1_coords):
pt = Point(
secp128r1_coords,
- X=Mod(0x4, secp128r1.curve.prime),
- Y=Mod(0x6, secp128r1.curve.prime),
- Z=Mod(2, secp128r1.curve.prime),
+ X=mod(0x4, secp128r1.curve.prime),
+ Y=mod(0x6, secp128r1.curve.prime),
+ Z=mod(2, secp128r1.curve.prime),
)
other = Point(
secp128r1_coords,
- X=Mod(0x2, secp128r1.curve.prime),
- Y=Mod(0x3, secp128r1.curve.prime),
- Z=Mod(1, secp128r1.curve.prime),
+ X=mod(0x2, secp128r1.curve.prime),
+ Y=mod(0x3, secp128r1.curve.prime),
+ Z=mod(1, secp128r1.curve.prime),
)
third = Point(
secp128r1_coords,
- X=Mod(0x5, secp128r1.curve.prime),
- Y=Mod(0x3, secp128r1.curve.prime),
- Z=Mod(1, secp128r1.curve.prime),
+ X=mod(0x5, secp128r1.curve.prime),
+ Y=mod(0x3, secp128r1.curve.prime),
+ Z=mod(1, secp128r1.curve.prime),
)
assert pt.equals(other)
assert pt != other
@@ -140,11 +140,11 @@ def test_equals(secp128r1, secp128r1_coords):
mont = MontgomeryModel()
different = Point(
mont.coordinates["xz"],
- X=Mod(
+ X=mod(
0x64DACCD2656420216545E5F65221EB,
0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
),
- Z=Mod(1, 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA),
+ Z=mod(1, 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA),
)
assert not pt.equals(different)
assert pt != different
@@ -153,9 +153,9 @@ def test_equals(secp128r1, secp128r1_coords):
def test_bytes(secp128r1, secp128r1_coords):
pt = Point(
secp128r1_coords,
- X=Mod(0x4, secp128r1.curve.prime),
- Y=Mod(0x6, secp128r1.curve.prime),
- Z=Mod(2, secp128r1.curve.prime),
+ X=mod(0x4, secp128r1.curve.prime),
+ Y=mod(0x6, secp128r1.curve.prime),
+ Z=mod(2, secp128r1.curve.prime),
)
assert bytes(pt) == \
b"\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02"
@@ -165,9 +165,9 @@ def test_bytes(secp128r1, secp128r1_coords):
def test_iter(secp128r1, secp128r1_coords):
pt = Point(
secp128r1_coords,
- X=Mod(0x4, secp128r1.curve.prime),
- Y=Mod(0x6, secp128r1.curve.prime),
- Z=Mod(2, secp128r1.curve.prime),
+ X=mod(0x4, secp128r1.curve.prime),
+ Y=mod(0x6, secp128r1.curve.prime),
+ Z=mod(2, secp128r1.curve.prime),
)
t = tuple(pt)
assert len(t) == 3
@@ -180,9 +180,9 @@ def test_iter(secp128r1, secp128r1_coords):
def test_pickle(secp128r1, secp128r1_coords):
pt = Point(
secp128r1_coords,
- X=Mod(0x4, secp128r1.curve.prime),
- Y=Mod(0x6, secp128r1.curve.prime),
- Z=Mod(2, secp128r1.curve.prime),
+ X=mod(0x4, secp128r1.curve.prime),
+ Y=mod(0x6, secp128r1.curve.prime),
+ Z=mod(2, secp128r1.curve.prime),
)
pickle.dumps(secp128r1_coords)
assert pt == pickle.loads(pickle.dumps(pt))