kryptools 1.3.2__tar.gz → 1.3.4__tar.gz

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

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

{kryptools-1.3.2 → kryptools-1.3.4}/kryptools/GF2.py

@@ -51,7 +51,7 @@ class GF2:
         self.order = 2**n  # 2**n
         self.print_hex: bool = True
         self.byteorder: str = "big"  # big|little
-        self.mult_order = self.order -1
+        self.mult_order = self.order - 1
         self.factors = {}  # factoring of the group order
 
     def __repr__(self):
@@ -99,6 +99,8 @@ class GF2:
 
     def generator(self) -> int | None:
         "Return a generator of the group GF(2^n)^*."
+        if self.power == 1:
+            return self(1)
         for a in range(2, self.order):
             a = self(a)
             if a.is_generator():
@@ -107,10 +109,10 @@ class GF2:
     def generators(self) -> list | None:
         "Return a generator for all generators of the group GF(2^n)^*."
         a = self.generator()
-        if a is not None:
-            for j in range(1, self.mult_order):
-                if gcd(j, self.mult_order) == 1:
-                    yield a**j
+        yield a
+        for j in range(2, self.mult_order):
+            if gcd(j, self.mult_order) == 1:
+                yield a**j
 
     def star(self) -> list:
         "Return a generator for all elements of the group GF(2^n)n^*."

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

@@ -229,6 +229,8 @@ class ZmodPoint:
 
     def order(self) -> int:
         "Compute the order of the point in the group Z_n^*."
+        if self.ring.n == 1:
+            return 1
         if self.x == 0 or gcd(self.x, self.ring.n) != 1:
             raise ValueError(f"{self.x} and {self.ring.n} are not coprime!")
         order = self.ring.order()  # use euler_phi(n) as our current guess

{kryptools-1.3.2 → kryptools-1.3.4}/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.2"
+__version__ = "1.3.4"
 __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.2 → kryptools-1.3.4}/kryptools/intfuncs.py

@@ -18,19 +18,18 @@ def iroot(k: int, n: int) -> int:
         raise ValueError(f"n={n} must be a nonegative integer.")
     if n <= 1 or k == 1:
         return n
-    if k == 2:
+    if k == 2: # use the faster internal function
         return isqrt(n)
-    rr = n
-    kk = k
-    while kk > 1:
-        kk //= 2
-        rr = isqrt(rr)
-    r = rr + 1
-    k1 = k-1
-    while rr < r:
+    l = n.bit_length()
+    if k >= l:
+        return 1
+    r = 1 << ((l-1)//k + 1) # use 2^ceil(l/k) as starting value
+    k1 = k - 1
+    while True:
+        rr = (k1 * r + n // r ** k1) // k  # Newton iteration
+        if rr >= r:
+            return r
         r = rr
-        rr = (k1 * rr + n // rr ** k1) // k  # Newton iteration
-    return r
 
 
 def ilog(b: int, n: int) -> int:

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

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

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

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

{kryptools-1.3.2 → kryptools-1.3.4}/tests/test_GF2.py

@@ -33,3 +33,28 @@ def test_GF2_ops():
         for _ in range(num_tests):
             a = randint(1, gf.order-1)
             assert (gf(a)**-1).poly() == gf(a).poly().inv()
+
+def test_GF2_order():
+    for n in range(1, 8):
+        gf = GF2(n)
+        assert len(list(gf)) == gf.order
+        assert len(list(gf.star())) == gf.order - 1
+        assert len(list(gf.generators())) == euler_phi(gf.order - 1)
+
+def test_GF2P_order():
+    for n in range(1, 9):
+        gf = GF2(n)
+        one = gf(1)
+        for x in gf.star():
+            o = 1
+            xx = x
+            while xx != one:
+                o += 1
+                xx *=x
+            assert o == x.order()
+
+def test_Zmod_generator():
+    for n in range(1, 9):
+        gf = GF2(n)
+        a = gf.generator()
+        assert a.order() == gf.mult_order

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

@@ -75,6 +75,18 @@ def test_Zmod_order():
         assert Zmod(n).order() == o
         assert len(list(Zmod(n).star())) == o
 
+def test_ZmodP_order():
+    for n in range(1,100):
+        ring = Zmod(n)
+        one = ring(1)
+        for x in ring.star():
+            o = 1
+            xx = x
+            while xx != one:
+                o += 1
+                xx *=x
+            assert o == x.order()
+
 def test_Zmod_field():
     for n in range(1, 100):
         assert Zmod(n).is_field() == is_prime(n)
@@ -95,9 +107,12 @@ OEIS_A046145 = [0, 1, 2, 3, 2, 5, 3, 0, 2, 3, 2, 0, 2, 3, 0, 0, 3, 5, 2, 0, 0, 7
 
 def test_Zmod_generator():
     for j, a in enumerate(OEIS_A046145):
-        aa = Zmod(j+1).generator()
+        ring = Zmod(j+1)
+        aa = ring.generator()
         if aa is None:
             aa = 0
+        else:
+            assert aa.order() == ring.order()
         assert a == int(aa)
 
 def test_Zmod_generators():