kryptools 1.3.4__tar.gz → 1.3.5__tar.gz

{kryptools-1.3.4 → kryptools-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryptools
-Version: 1.3.4
+Version: 1.3.5
 Summary: Implemenation of same basic algorithms used in cryptography.
 Author-email: Gerald Teschl <gerald.teschl@univie.ac.at>
 License: MIT

{kryptools-1.3.4 → kryptools-1.3.5}/kryptools/Zmod.py

@@ -5,6 +5,7 @@ Ring of intergers modulo `n`.
 from math import gcd
 from .factor import factorint
 from .primes import is_prime
+from .nt import sqrt_mod, crt
 from .intfuncs import prime_power
 
 
@@ -30,12 +31,13 @@ class Zmod:
         if not isinstance(n, int) or n < 1:
             raise ValueError(f"{n} is not a positive integer.")
         self.n = n
+        self.n_factors = {} # factoring of n
         self.short = short
         self.group_order = 0
-        self.factors = {}  # factoring of the group order
+        self.factors = {}  # factoring of the multiplicative group order
 
     def __repr__(self):
-        return f"Z_{self.n})"
+        return f"Z_{self.n}"
 
     def __call__(self, x: int | list | tuple):
         if isinstance(x, list|tuple):
@@ -59,7 +61,9 @@ class Zmod:
         if self.group_order:
             return self.group_order
         # We compute euler_phi(n) and its factorization in one pass
-        for p, k in factorint(self.n).items():  # first factorize n
+        if not self.n_factors:
+            self.n_factors = factorint(self.n)
+        for p, k in self.n_factors.items():  # first factorize n
             # factor p-1 and add the factors
             for pm, km in factorint(p - 1).items():
                 if pm in self.factors:
@@ -243,6 +247,56 @@ class ZmodPoint:
                     break
         return order
 
+    def sqrt(self) -> "ZmodPoint":
+        if not self.ring.n_factors:
+            self.ring.n_factors = factorint(self.ring.n)
+        a = int(self)
+        if a in (0, 1):
+            return self.ring(a)
+        roots = []
+        powers = []
+        for p, k in self.ring.n_factors.items():
+            q = p**(k-1)
+            pk = q * p
+            ak = a % pk
+            powers.append(pk)
+            if ak in (0, 1):
+                roots.append(ak)
+                continue
+            # write ak as p^j * invertible
+            j = 0
+            while ak % p == 0:
+                j += 1
+                ak //= p
+            if j % 2:
+                raise ValueError("No quadratic residue!")
+            if ak == 1:
+                roots.append(p**(j//2))
+                continue
+            if p == 2:
+                if ak % 8 != 1:
+                    raise ValueError("No quadratic residue!")
+                m = 4 # start at 2^2
+                x = ak % m # this is the root mod m
+                for i in range(3, k + 1):
+                    # test all 4 poosible roots
+                    if (x**2 - ak) % (m * 2):
+                        x = m - x
+                        if (x**2 - ak) % (m*2):
+                            x = (x * (m//2-1)) % m
+                            if (x**2 - ak) % (m * 2):
+                                x = m - x
+                    m *= 2
+            else:
+                # odd prime: Cipolla's formula
+                x = sqrt_mod(ak, p)
+                if x is None:
+                    raise ValueError("No quadratic residue!")
+                if k > 1:
+                    x = pow(x, q, pk) * pow(ak,((p-2)*q+1)//2, pk) % pk
+            roots.append((p**(j//2) * x) % pk)
+        return self.ring(crt(roots, powers))
+
     def is_generator(self):
         "Test if the point is a generator of the group Z_n^*."
         return self.ring.order() == self.order()

{kryptools-1.3.4 → kryptools-1.3.5}/kryptools/__init__.py

@@ -5,7 +5,7 @@ Implemenation of same basic algorithms used in cryptography.
 __author__ = "Gerald Teschl"
 __copyright__ = "Copyright 2024-2025, Gerald Teschl"
 __license__ = "MIT License"
-__version__ = "1.3.4"
+__version__ = "1.3.5"
 __email__ = "Gerald.Teschl@univie.ac.at"
 
 from .nt import egcd, cf, convergents, legendre_symbol, jacobi_symbol, sqrt_mod, euler_phi, carmichael_lambda, moebius_mu, is_carmichael_number, order, crt

{kryptools-1.3.4 → kryptools-1.3.5}/kryptools/factor.py

@@ -6,6 +6,7 @@ Factorization of integers:
 
 from math import isqrt, gcd, prod, floor, log10
 from .primes import sieve_eratosthenes, is_prime
+from .intfuncs import perfect_power
 from .factor_pm1 import _pm1_parameters, factor_pm1
 from .factor_ecm import _ecm_parameters, factor_ecm
 #from .factor_qs import factor_qs
@@ -86,10 +87,16 @@ def factorint(n: int, trial_bnd: int = 2500, verbose: int = 0) -> dict:
         return prime_factors
     if verbose:
         print("Trial division found:", list(prime_factors))
+    # check if the remainder is a perfect power
+    res = perfect_power(n)
+    if res:
+        n, k = res
+    else:
+        n, k = n, 1
     if is_prime(n, trialdivision=False):
-        prime_factors[n] = 1
+        prime_factors[n] = k
         return prime_factors
-    remaining_factors = {n: 1}
+    remaining_factors = {n: k}
 
     # https://gitlab.inria.fr/zimmerma/ecm/
     ECM_PARAMETERS = [

{kryptools-1.3.4 → kryptools-1.3.5}/kryptools/nt.py

@@ -111,7 +111,7 @@ def jacobi_symbol(a: int, n: int) -> int:
     return 0
 
 
-def sqrt_mod(a: int, p: int) -> int:
+def sqrt_mod(a: int, p: int) -> int|None:
     """Compute a square root of `a` modulo `p` unsing Cipolla's algorithm."""
     a %= p
     if a in (0, 1):
@@ -120,6 +120,12 @@ def sqrt_mod(a: int, p: int) -> int:
         return None
     if p % 4 == 3:  # easy case
         return pow(a, (p + 1) // 4, p)
+    if p % 8 == 5:
+        x = pow(a, (p + 3)//8, p)
+        c = pow(x, 2, p)
+        if c % p == a:
+            return x
+        return (x * pow(2, (p - 1)//4, p)) % p
     # Cipolla's algorithm
     for c in range(1, p):  # find a field extension
         tmp = (c * c - a) % p

{kryptools-1.3.4 → kryptools-1.3.5}/kryptools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryptools
-Version: 1.3.4
+Version: 1.3.5
 Summary: Implemenation of same basic algorithms used in cryptography.
 Author-email: Gerald Teschl <gerald.teschl@univie.ac.at>
 License: MIT

{kryptools-1.3.4 → kryptools-1.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryptools"
-version = "1.3.4"
+version = "1.3.5"
 authors = [
   { name="Gerald Teschl", email="gerald.teschl@univie.ac.at" },
 ]

{kryptools-1.3.4 → kryptools-1.3.5}/tests/test_Zmod.py

@@ -87,6 +87,26 @@ def test_ZmodP_order():
                 xx *=x
             assert o == x.order()
 
+def test_ZmodP_sqrt():
+    for n in range(1,100):
+        print(n)
+        ring = Zmod(n)
+        one = ring(1)
+        roots = {} # compute a dict of all roots
+        for x in ring:
+            y = x**2
+            if y in roots:
+               roots[y].append(x)
+            else:
+                roots[y] = [ x ]
+        for x in ring:
+            if x not in roots:
+                with pytest.raises(ValueError):
+                    x.sqrt()
+            else:
+                y = x.sqrt()
+                assert y**2 == x
+
 def test_Zmod_field():
     for n in range(1, 100):
         assert Zmod(n).is_field() == is_prime(n)