kryptools 0.9__tar.gz → 0.9.1__tar.gz

{kryptools-0.9 → kryptools-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kryptools
-Version: 0.9
+Version: 0.9.1
 Summary: Implemenation of same basic algorithms used in cryptography.
 Author-email: Gerald Teschl <gerald.teschl@univie.ac.at>
 Project-URL: Homepage, https://github.com/teschlg/kryptools

{kryptools-0.9 → kryptools-0.9.1}/kryptools/__init__.py

@@ -3,7 +3,7 @@ Implemenation of same basic algorithms used in cryptography.
 """
 
 from .nt import egcd, cf, convergents, legendre_symbol, jacobi_symbol, sqrt_mod, euler_phi, carmichael_lambda, order, crt
-from .primes import sieve_eratosthenes, is_prime, next_prime, random_prime, random_strongprime, is_safeprime, random_safeprime
+from .primes import sieve_eratosthenes, is_prime, next_prime, previous_prime, random_prime, random_strongprime, is_safeprime, random_safeprime
 from .factor import factorint
 from .dlp import dlog
 from .ec import EC_Weierstrass

{kryptools-0.9 → kryptools-0.9.1}/kryptools/la.py

@@ -211,7 +211,7 @@ class Matrix:
 
     def det(self) -> int:
         "Compute the determinant of a matrix M."
-        if self.rows != self.rows:
+        if self.rows != self.cols:
             raise ValueError("Matrix must be square!")
         n, m = self.cols, self.rows
         R = self[:, :]
@@ -239,7 +239,7 @@ class Matrix:
 
     def inv(self) -> "Matrix":
         "Compute the inverse of a square matrix M."
-        if self.rows != self.rows:
+        if self.rows != self.cols:
             raise ValueError("Matrix must be square!")
         n = self.cols
         MM = Matrix([[0 for _ in range(2*n)] for _ in range(n)])
@@ -253,7 +253,7 @@ class Matrix:
 
     def is_unimodular(self) -> bool:
         "Test if the matrix is unimodular."
-        if self.rows != self.rows:
+        if self.rows != self.cols:
             return False
         def is_integer(i):
             if isinstance(i, int) or (isinstance(i, Fraction) and i.denominator == 1):
@@ -262,7 +262,7 @@ class Matrix:
         return all([is_integer(i) for i in self]) and self.det()**2 == 1
 
     def zeros(self, m: int = None, n: int = None):
-        "Returns a zero matrix of the same dimension"
+        "Returns a zero matrix of the same dimension."
         if not m and not n:
             n, m = self.cols, self.rows
         elif not n:
@@ -274,7 +274,7 @@ class Matrix:
         return Matrix([[ zero for j in range(n) ] for i in range(m) ])
 
     def eye(self, m: int = None, n: int = None):
-        "Returns an identity matrix of the same dimension"
+        "Returns an identity matrix of the same dimension."
         def delta(i, j):
             if i == j:
                 return one
@@ -292,13 +292,13 @@ class Matrix:
 
 
 def zeros(m: int, n: int = None, zero = 0) -> "Matrix":
-    "Returns a zero matrix of the given dimension"
+    "Returns a zero matrix of the given dimension."
     if not n:
         n = m
     return Matrix([[ zero for j in range(n) ] for i in range(m) ])
 
 def eye(m:int, n: int = None) -> "Matrix":
-    "Returns an identity matrix of the given dimension"
+    "Returns an identity matrix of the given dimension."
     def delta(i, j):
         if i == j:
             return 1

{kryptools-0.9 → kryptools-0.9.1}/kryptools/lat.py

@@ -42,6 +42,8 @@ def hermite_nf(M: Matrix) -> Matrix:
             H[:, jj] -= tmp * H[:, j]
         #print(H)
         j -= 1
+        if j < 0:
+            break
     while H.cols> 1 and all(not H[i, 0] for i in range(m)): # remove zero columns
         H = H[:,1:]
     return H

{kryptools-0.9 → kryptools-0.9.1}/kryptools/primes.py

@@ -3,6 +3,7 @@ Tools for prime numbers:
     sieve_eratosthenes(B) a tuple of all primes up to including B
     is_prime(n) test if n is probably prime
     next_prime(n) find the next prime larger or equal n
+    previous_prime(n) find the previous prime smaller or equal n
     random_prime(l) find a pseudorandom prime with bit length at least l
     random_strongprime(l) find a pseudorandom strong prime with bit length at least l
     is_safeprime(n) test if n is a safe prime
@@ -17,14 +18,14 @@ from .nt import jacobi_symbol
 
 def sieve_eratosthenes(B: int) -> tuple:
     """Returns a tuple of all primes up to (including) `B`."""
-    B1 = (isqrt(B) -1)//2
+    B1 = (isqrt(B) - 1)//2
     B = (B - 1)//2
-    isprime = [True] * (B + 1)  # to begin with, all numbers are potentially prime
-    # sieve out the primes p=2*q+1 starting at 3 in steps of 2 (ignoring even numbers)
+    isprime = [True] * (B + 1)  # to begin with, all odd numbers are potentially prime
+    # sieve out the primes p=2*q+1 starting at q = 1
     for q in range(1, B1 + 1):
-        if isprime[q]: # sieve out all multiples; numbers p*q with q<p were already sieved out previously
-            qq = (q << 1) * (q + 1)
-            p = (q << 1) | 1
+        if isprime[q]: # sieve out all multiples; numbers p*r with r<p were already sieved out previously
+            qq = 2 * q * (q + 1)
+            p = 2 * q + 1
             isprime[qq :: p] = [False] * ((B - qq) // p + 1)
 
     return tuple([2] + [2 * q + 1 for q in range(1, B + 1) if isprime[q]])
@@ -67,11 +68,22 @@ def is_prime(n: int) -> bool:
 
 def next_prime(n: int) -> int:
     """Find the next prime larger or equal `n`."""
+    if n < 3:
+        return 2
     n |= 1  # make sure n is odd
     while not is_prime(n):
         n += 2
     return n
 
+def previous_prime(n: int) -> int:
+    """Find the previous prime smaller or equal `n`."""
+    if n < 3:
+        return 2
+    n += (n & 1) - 1  # make sure n is odd
+    while not is_prime(n):
+        n -= 2
+    return n
+
 def random_prime(l: int) -> int:
     """Find a pseudorandom prime with bit length at least `l`."""
     return next_prime(randint(2 ** (l - 1), 2**l - 1))

{kryptools-0.9 → kryptools-0.9.1}/kryptools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kryptools
-Version: 0.9
+Version: 0.9.1
 Summary: Implemenation of same basic algorithms used in cryptography.
 Author-email: Gerald Teschl <gerald.teschl@univie.ac.at>
 Project-URL: Homepage, https://github.com/teschlg/kryptools

{kryptools-0.9 → kryptools-0.9.1}/pyproject.toml

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