kryptools 1.0__tar.gz → 1.0.1__tar.gz

{kryptools-1.0 → kryptools-1.0.1}/PKG-INFO

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

{kryptools-1.0 → kryptools-1.0.1}/kryptools/__init__.py

@@ -5,7 +5,7 @@ Implemenation of same basic algorithms used in cryptography.
 __author__ = "Gerald Teschl"
 __copyright__ = "Copyright 2024, Gerald Teschl"
 __license__ = "MIT License"
-__version__ = "0.9.15"
+__version__ = "1.0.1"
 __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.0 → kryptools-1.0.1}/kryptools/des.py

@@ -151,10 +151,18 @@ class FeistelCipher:
         "Switch left and right halves"
         self.state = self.right() + self.left()
 
-    def f_box(self, a: list[int], key: list[int]) -> list[int]:
+    def f_box(self, a: list[int], key: list[int], showtmp:bool = False) -> list[int]:
         "Nonlinear f-box"
+        if showtmp:
+            def printtmp(title:str, a: list) -> None:
+                print(f"{title}: {"".join(map(str,a))}")
+        else:
+            def printtmp(title:str, a: list) -> None:
+                pass
         a = permute(a, self.__class__.E_box)  # expansion box
+        printtmp("EBox", a)
         a = self.xor(a, key)  # add key
+        printtmp("XKey", a)
         split = len(self.__class__.S_split)
         # apply sboxes
         num_sbox = len(self.__class__.S_box)  # number of sboxes
@@ -168,7 +176,9 @@ class FeistelCipher:
             s = self.__class__.S_box[i][index]
             aa += [int(d) for d in str(format(s, "0" + str(out_len) + "b"))]
         a = aa
+        printtmp("SBox", a)
         a = permute(a, self.__class__.P_box) # permutation box
+        printtmp("PBox", a)
         return a
 
     def ip(self) -> None:
@@ -298,7 +308,7 @@ class DESCipher(FeistelCipher):
              0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
              4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
              15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13),
-        (15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 1,
+        (15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
              3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
              0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
              13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9),

{kryptools-1.0 → kryptools-1.0.1}/kryptools.egg-info/PKG-INFO

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

{kryptools-1.0 → kryptools-1.0.1}/pyproject.toml

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

kryptools-1.0.1/tests/test_des.py

@@ -0,0 +1,59 @@
+import pytest
+from kryptools import SDESKeySchedule, SDESCipher, DESKeySchedule, DESCipher, list2int
+
+
+def test_SDES():
+    # Test the key schedule
+    key = 34
+    test_values = [[0, 0, 1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 0, 0, 1, 0]]
+
+    ks = SDESKeySchedule(key)
+    assert ks.gen_keys() == test_values
+
+    # Test the encryption
+    x = b'\x01'
+    y = b'\xb9'
+
+    sdes = SDESCipher(key)
+    sdes(x).encrypt()
+    assert bytes(sdes) == y
+    assert sdes.decrypt() == x
+
+
+def test_DES():
+    # Test the key schedule
+    key = 0x0123456789ABCDEF.to_bytes(8, 'big')
+    test_values = [0x0B02679B49A5, 0x69A659256A26, 0x45D48AB428D2, 0x7289D2A58257, 0x3CE80317A6C2, 0x23251E3C8545, 0x6C04950AE4C6, 0x5788386CE581,
+                   0xC0C9E926B839, 0x91E307631D72, 0x211F830D893A, 0x7130E5455C54, 0x91C4D04980FC, 0x5443B681DC8D, 0xB691050A16B5, 0xCA3D03B87032]
+
+    ks = DESKeySchedule(key)
+    keys = ks.gen_keys()
+    for k1, k2 in zip(keys, test_values):
+        assert list2int(k1) == k2
+
+    # Test the encryption (Handbook of Applied Cryptography and NBS Special Publication 500-20)
+    test_values = [[ 0x0123456789ABCDEF, 0x4E6F772069732074, 0x3FA40E8A984D4815 ],
+        [0x10316E028C8F3B4A, 0x0000000000000000, 0x82DCBAFBDEAB6602],
+        [0x0101010101010101, 0x95F8A5E5DD31D900, 0x8000000000000000],
+        [0x0101010101010101, 0xDD7F121CA5015619, 0x4000000000000000],
+        [0x0101010101010101, 0x2E8653104F3834EA, 0x2000000000000000],
+        [0x0101010101010101, 0x4BD388FF6CD81D4F, 0x1000000000000000],
+        [0x0101010101010101, 0x20B9E767B2FB1456, 0x0800000000000000],
+        [0x0101010101010101, 0x8000000000000000, 0x95F8A5E5DD31D900],
+        [0x0101010101010101, 0x4000000000000000, 0xDD7F121CA5015619],
+        [0x0101010101010101, 0x2000000000000000, 0x2E8653104F3834EA],
+        [0x0101010101010101, 0x1000000000000000, 0x4BD388FF6CD81D4F],
+        [0x8001010101010101, 0x0000000000000000, 0x95A8D72813DAA94D],
+        [0x4001010101010101, 0x0000000000000000, 0x0EEC1487DD8C26D5],
+        [0x2001010101010101, 0x0000000000000000, 0x7AD16FFB79C45926],
+        [0x1001010101010101, 0x0000000000000000, 0xD3746294CA6A6CF3]]
+
+    for key, x, y in test_values:
+        key = key.to_bytes(8, 'big')
+        x = x.to_bytes(8, 'big')
+        y = y.to_bytes(8, 'big')
+
+        des = DESCipher(key)
+        des(x).encrypt()
+        assert bytes(des) == y
+        assert des.decrypt() == x

kryptools-1.0/tests/test_des.py

@@ -1,42 +0,0 @@
-import pytest
-from kryptools import SDESKeySchedule, SDESCipher, DESKeySchedule, DESCipher, list2int
-
-
-def test_SDES():
-    # Test the key schedule
-    key = 34
-    test_values = [[0, 0, 1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 0, 0, 1, 0]]
-
-    ks = SDESKeySchedule(key)
-    assert ks.gen_keys() == test_values
-
-    # Test the encryption
-    x = b'\x01'
-    y = b'\xb9'
-
-    sdes = SDESCipher(key)
-    sdes(x).encrypt()
-    assert bytes(sdes) == y
-    assert sdes.decrypt() == x
-
-
-def test_DES():
-    # Test the key schedule
-    key = 0x0123456789ABCDEF.to_bytes(8, 'big')
-    test_values = [0x0B02679B49A5, 0x69A659256A26, 0x45D48AB428D2, 0x7289D2A58257, 0x3CE80317A6C2, 0x23251E3C8545, 0x6C04950AE4C6, 0x5788386CE581,
-                   0xC0C9E926B839, 0x91E307631D72, 0x211F830D893A, 0x7130E5455C54, 0x91C4D04980FC, 0x5443B681DC8D, 0xB691050A16B5, 0xCA3D03B87032]
-
-    ks = DESKeySchedule(key)
-    keys = ks.gen_keys()
-    for k1, k2 in zip(keys, test_values):
-        assert list2int(k1) == k2
-
-    # Test the encryption (Handbook of Applied Cryptography)
-    key = 0x0123456789ABCDEF.to_bytes(8, 'big')
-    x = 0x4E6F772069732074.to_bytes(8, 'big')
-    y = 0x3FA40E8A984D4815.to_bytes(8, 'big')
-
-    des = DESCipher(key)
-    des(x).encrypt()
-    assert bytes(des) == y
-    assert des.decrypt() == x