Merge pull request #233 from tomato42/more-test-coverage

More test coverage

Author: tomato42

src/ecdsa/keys.py

@@ -960,7 +960,7 @@ def from_pem(cls, string, hashfunc=sha1):
         :return: Initialised SigningKey object
         :rtype: SigningKey
         """
-        if not PY2 and isinstance(string, str):
+        if not PY2 and isinstance(string, str):  # pragma: no branch
             string = string.encode()
 
         # The privkey pem may have multiple sections, commonly it also has

src/ecdsa/test_jacobi.py

@@ -312,6 +312,29 @@ def test_add_same_scale_points(self, a_mul, b_mul, new_z):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
+    def test_add_same_scale_points_static(self):
+        j_g = generator_brainpoolp160r1
+        p = curve_brainpoolp160r1.p()
+        a = j_g * 11
+        a.scale()
+        z1 = 13
+        x = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+        y = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+
+        c = a + a
+
+        self.assertEqual(c, x + y)
+
     @settings(max_examples=14)
     @given(
         st.integers(
@@ -363,6 +386,30 @@ def test_add_different_scale_points(self, a_mul, b_mul, new_z):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
+    def test_add_different_scale_points_static(self):
+        j_g = generator_brainpoolp160r1
+        p = curve_brainpoolp160r1.p()
+        a = j_g * 11
+        a.scale()
+        z1 = 13
+        x = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+        z2 = 29
+        y = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z2 ** 2 % p,
+            a.y() * z2 ** 3 % p,
+            z2,
+        )
+
+        c = a + a
+
+        self.assertEqual(c, x + y)
+
     def test_add_point_3_times(self):
         j_g = PointJacobi.from_affine(generator_256)
 

src/ecdsa/test_keys.py

@@ -22,7 +22,9 @@
     sigdecode_der,
     sigdecode_strings,
 )
-from .curves import NIST256p
+from .curves import NIST256p, Curve, BRAINPOOLP160r1
+from .ellipticcurve import Point
+from .ecdsa import generator_brainpoolp160r1
 
 
 class TestVerifyingKeyFromString(unittest.TestCase):
@@ -207,6 +209,17 @@ def test_VerifyingKey_inequality_on_same_curve(self):
     def test_SigningKey_inequality_on_same_curve(self):
         self.assertNotEqual(self.sk, self.sk2)
 
+    def test_inequality_on_wrong_types(self):
+        self.assertNotEqual(self.vk, self.sk)
+
+    def test_from_public_point_old(self):
+        pj = self.vk.pubkey.point
+        point = Point(pj.curve(), pj.x(), pj.y())
+
+        vk = VerifyingKey.from_public_point(point, self.vk.curve)
+
+        self.assertEqual(vk, self.vk)
+
 
 class TestSigningKey(unittest.TestCase):
     """
@@ -458,3 +471,37 @@ def test_SigningKey_with_unlikely_value():
     vk = sk.verifying_key
     sig = sk.sign(b"hello")
     assert vk.verify(sig, b"hello")
+
+
+def test_SigningKey_with_custom_curve_old_point():
+    generator = generator_brainpoolp160r1
+    generator = Point(
+        generator.curve(), generator.x(), generator.y(), generator.order(),
+    )
+
+    curve = Curve(
+        "BRAINPOOLP160r1",
+        generator.curve(),
+        generator,
+        (1, 3, 36, 3, 3, 2, 8, 1, 1, 1),
+    )
+
+    sk = SigningKey.from_secret_exponent(12, curve)
+
+    sk2 = SigningKey.from_secret_exponent(12, BRAINPOOLP160r1)
+
+    assert sk.privkey == sk2.privkey
+
+
+def test_VerifyingKey_inequality_with_different_curves():
+    sk1 = SigningKey.from_secret_exponent(2, BRAINPOOLP160r1)
+    sk2 = SigningKey.from_secret_exponent(2, NIST256p)
+
+    assert sk1.verifying_key != sk2.verifying_key
+
+
+def test_VerifyingKey_inequality_with_different_secret_points():
+    sk1 = SigningKey.from_secret_exponent(2, BRAINPOOLP160r1)
+    sk2 = SigningKey.from_secret_exponent(3, BRAINPOOLP160r1)
+
+    assert sk1.verifying_key != sk2.verifying_key

src/ecdsa/test_numbertheory.py

@@ -82,6 +82,32 @@ def test_square_root_mod_prime_for_small_primes(prime):
             square_root_mod_prime(nonsquare, prime)
 
 
+def test_square_root_mod_prime_for_2():
+    a = square_root_mod_prime(1, 2)
+    assert a == 1
+
+
+def test_square_root_mod_prime_for_small_prime():
+    root = square_root_mod_prime(98 ** 2 % 101, 101)
+    assert root * root % 101 == 9
+
+
+def test_square_root_mod_prime_for_p_congruent_5():
+    p = 13
+    assert p % 8 == 5
+
+    root = square_root_mod_prime(3, p)
+    assert root * root % p == 3
+
+
+def test_square_root_mod_prime_for_p_congruent_5_large_d():
+    p = 29
+    assert p % 8 == 5
+
+    root = square_root_mod_prime(4, p)
+    assert root * root % p == 4
+
+
 @st.composite
 def st_two_nums_rel_prime(draw):
     # 521-bit is the biggest curve we operate on, use 1024 for a bit
@@ -324,6 +350,32 @@ def test_factorization(self, num):
             mult *= i[0] ** i[1]
         assert mult == num
 
+    def test_factorisation_smallprimes(self):
+        exp = 101 * 103
+        assert 101 in smallprimes
+        assert 103 in smallprimes
+        factors = factorization(exp)
+        mult = 1
+        for i in factors:
+            mult *= i[0] ** i[1]
+        assert mult == exp
+
+    def test_factorisation_not_smallprimes(self):
+        exp = 1231 * 1237
+        assert 1231 not in smallprimes
+        assert 1237 not in smallprimes
+        factors = factorization(exp)
+        mult = 1
+        for i in factors:
+            mult *= i[0] ** i[1]
+        assert mult == exp
+
+    def test_jacobi_with_zero(self):
+        assert jacobi(0, 3) == 0
+
+    def test_jacobi_with_one(self):
+        assert jacobi(1, 3) == 1
+
     @settings(**HYP_SETTINGS)
     @given(st.integers(min_value=3, max_value=1000).filter(lambda x: x % 2))
     def test_jacobi(self, mod):

src/ecdsa/test_pyecdsa.py

@@ -5,6 +5,7 @@
 except ImportError:
     import unittest
 import os
+import sys
 import shutil
 import subprocess
 import pytest
@@ -1396,6 +1397,17 @@ def test_trytryagain(self):
             b("6fa59d73bf0446ae8743cf748fc5ac11d5585a90356417e97155c3bc"),
         )
 
+    def test_trytryagain_single(self):
+        tta = util.randrange_from_seed__trytryagain
+        order = 2 ** 8 - 2
+        seed = b"text"
+        n = tta(seed, order)
+        # known issue: https://github.com/warner/python-ecdsa/issues/221
+        if sys.version_info < (3, 0):  # pragma: no branch
+            self.assertEqual(n, 228)
+        else:
+            self.assertEqual(n, 18)
+
     @given(st.integers(min_value=0, max_value=10 ** 200))
     def test_randrange(self, i):
         # util.randrange does not provide long-term stability: we might