Merge pull request #50 from Glindeb/dev

Dev

Author: Glindeb

.github/workflows/core.yml

@@ -65,9 +65,9 @@ jobs:
         uses: 'marvinpinto/action-automatic-releases@latest'
         with:
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          automatic_release_tag: v1.1.6
+          automatic_release_tag: v1.2.0
           prerelease: false
-          title: v1.1.6
+          title: v1.2.0
           files: |
             dist/*
 

Documentation/Rapport/Introduction.tex

@@ -1,8 +1,25 @@
 \mychapter{Introduktion}
 
-\section{Inledning}
-abstract
+Kryptering, något vi möter varje dag i dagens samhälle men...
+
+När de vi idag kallar internet uppkom och öppnades för allmänheten så var tankarna på hur
+våran data och information
+
+Hela tiden runt om oss skickas information digitalt från enhet till enhet. Information från
+höger till väster bara flödar ...
+
+Information, en grundsten i dagens samhälle ...
+
 \section{Syfte}
-abstract
-\section{Frågeställning}
-abstract
+Syftet med denna undersökning är att utveckla förståelsen för kryptering och krypterings
+algoritmer
+
+
+\section{Frågeställningar}
+Hur påverkas tiden de tar att kryptera en mängd data mellan de olika nyckel längderna 128-bit,
+192-bit och 256-bit nyckel?
+
+Hur påverkas 
+
+Vad är skillnaden i tiden de tar för att kryptera något mellan att köra algoritmen i ECB, CBC
+[och något mer], Samt vilken betydelse ur ett användnings perspektiv får de?

Documentation/Rapport/Main.pdf

@@ -114,8 +114,7 @@
     \vspace{3.5cm}
 	{\huge\bfseries The AES encryption algorithm\par}
     \vspace{0.1cm}
-    ~{\large En undersökning av The Advanced Encryption Standard (AES) \par
-    ~ur ett struktur och användnings perspektiv}
+    ~{\large En undersökning av The Advanced Encryption Standard (AES)}
 
 % Bottom of the page
     \vfill

Documentation/Rapport/Main.synctex.gz

@@ -5,4 +5,5 @@ @misc{wikipedia_2022
     publisher = {Wikimedia Foundation},
     year = {2022},
     month = {Jun}
-}
+}
+

Documentation/Rapport/Main.tex

@@ -21,7 +21,7 @@ Implemented running modes
 - [x] **CBC** - Cipher Block Chaining mode (For more information see ...)
 - [x] **PCBC** - Propagating Cipher Block Chaining mode (For more information see ...)
 - [ ] **CFB** - Cipher Feedback mode (For more information see ...)
-- [ ] **OFB** - Output FeedBack mode (For more information see ...)
+- [x] **OFB** - Output FeedBack mode (For more information see ...)
 - [ ] **CTR** - Counter mode (For more information see ...)
 - [ ] **GCM** - Galois/Counter mode (For more information see ...)
 

Documentation/Rapport/Ref.bib

@@ -585,3 +585,85 @@ def pcbc_dec(key, file_path, iv, terminal_width=80):
         progress = progress_bar(progress, file_size, terminal_width)
     progress = progress_bar(progress, file_size, terminal_width)
     remove(file_path)
+
+
+# OFB encryption function (Tested but no automated test implemented and no test with different file sizes)
+def ofb_enc(key, file_path, iv, terminal_width=80):
+    file_size = getsize(file_path)
+    progress = 0
+    progress = progress_bar(progress, file_size, terminal_width)
+    mix = [int(iv[i:i+2], 16) for i in range(0, len(iv), 2)]
+    iv = mix
+
+    with open(f"{file_path}.enc", 'wb') as output, open(file_path, 'rb') as data:
+        for i in range(int(file_size/16)):
+            raw = [i for i in data.read(16)]
+            mix = encryption_rounds(mix, key)
+            result = xor(raw, mix)
+            output.write(bytes(result))
+            progress = progress_bar(progress, file_size, terminal_width)
+
+        if file_size % 16 != 0:
+            raw = [i for i in data.read()]
+            raw, length = add_padding(raw)
+
+            if file_size < 16:
+                mix = encryption_rounds(iv, key)
+            else:
+                mix = encryption_rounds(mix, key)
+            result = xor(mix, raw)
+
+            mix = encryption_rounds(mix, key)
+            identifier = xor(([0 for i in range(15)] + [length]), mix)
+
+            output.write(bytes(result + identifier))
+            progress = progress_bar(progress, file_size, terminal_width)
+        else:
+            mix = encryption_rounds(mix, key)
+            identifier = xor([0 for i in range(16)], mix)
+            output.write(bytes(identifier))
+            progress = progress_bar(progress, file_size, terminal_width)
+    progress = progress_bar(progress, file_size, terminal_width)
+    remove(file_path)
+
+
+# OFB decryption function (Tested but no automated test implemented and no test with different file sizes)
+def ofb_dec(key, file_path, iv, terminal_width=80):
+    iv = [int(iv[i:i+2], 16) for i in range(0, len(iv), 2)]
+    file_size = getsize(file_path)
+    progress = 0
+    progress = progress_bar(progress, file_size, terminal_width)
+    file_name = file_path[:-4]
+
+    with open(f"{file_name}", 'wb') as output, open(file_path, 'rb') as data:
+        if int(file_size/16) - 3 >= 0:
+            raw = [i for i in data.read(16)]
+            mix = encryption_rounds(iv, key)
+            result = xor(raw, mix)
+            output.write(bytes(result))
+            progress = progress_bar(progress, file_size, terminal_width)
+
+            for i in range(int(file_size/16) - 3):
+                raw = [i for i in data.read(16)]
+                mix = encryption_rounds(mix, key)
+                result = xor(raw, mix)
+                output.write(bytes(result))
+                progress = progress_bar(progress, file_size, terminal_width)
+        else:
+            mix = iv
+
+        data_pice = [i for i in data.read(16)]
+        identifier = [i for i in data.read()]
+
+        mix = encryption_rounds(mix, key)
+        data_pice = xor(data_pice, mix)
+
+        mix = encryption_rounds(mix, key)
+        identifier = xor(identifier, mix)
+
+        result = bytes(remove_padding(data_pice, identifier))
+
+        output.write(result)
+        progress = progress_bar(progress, file_size, terminal_width)
+    progress = progress_bar(progress, file_size, terminal_width)
+    remove(file_path)

README.md

@@ -19,7 +19,7 @@
 __copyright__ = 'Copyright 2022, Gabriel Lindeblad'
 __credits__ = [""]
 __license__ = 'MIT'
-__version__ = '1.1.6'
+__version__ = '1.2.0'
 __maintainer__ = 'Gabriel Lindeblad'
 __email__ = '[email protected]'
 __status__ = 'Development'

src/PyAES/AES.py

@@ -23,6 +23,8 @@ def decrypt(key, file_path, running_mode, iv=None, terminal_size=80):
         AES.cbc_dec(key, file_path, iv, terminal_size)
     elif running_mode == "PCBC" and iv is not None:
         AES.pcbc_dec(key, file_path, iv, terminal_size)
+    elif running_mode == "OFB" and iv is not None:
+        AES.ofb_dec(key, file_path, iv, terminal_size)
     else:
         raise Exception("Running mode not supported")
 

src/PyAES/__init__.py

@@ -21,6 +21,8 @@ def encrypt(key, file_path, running_mode, iv=None, terminal_size=80):
         AES.cbc_enc(key, file_path, iv, terminal_size)
     elif running_mode == "PCBC" and iv is not None:
         AES.pcbc_enc(key, file_path, iv, terminal_size)
+    elif running_mode == "OFB" and iv is not None:
+        AES.ofb_enc(key, file_path, iv, terminal_size)
     else:
         raise Exception("Running mode not supported")
 

src/PyAES/decrypt.py

@@ -27,6 +27,7 @@ def test_aes_decryption_ECB(data, key, file_name, expected):
 
     assert result == expected
 
+
 @pytest.mark.parametrize("data,key,file_name,iv,expected", [
     # 128 bit
     (b'\xe4\xa7\x0e\xbd\x84\xfa\xf5\xd8`\xb8\xa1\x10\x0b~\xadh\x89Feso\xc5~_|\xe9\x1bG\xd9*\\\x81', "2b7e151628aed2a6abf7158809cf4f3c", "tmp1.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890'),
@@ -53,6 +54,7 @@ def test_aes_decryption_CBC(data, key, file_name, iv, expected):
 
     assert result == expected
 
+
 @pytest.mark.parametrize("data,key,file_name,iv,expected", [
     # 128 bit
     (b'\xe4\xa7\x0e\xbd\x84\xfa\xf5\xd8`\xb8\xa1\x10\x0b~\xadhJ\xa98\x9f\xceZ\xd4\x9f"\xde\x00\xf6w\xa9\x1b\x05', "2b7e151628aed2a6abf7158809cf4f3c", "tmp1.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890'),
@@ -78,3 +80,30 @@ def test_aes_decryption_PCBC(data, key, file_name, iv, expected):
     os.remove(file_name)
 
     assert result == expected
+
+
+@pytest.mark.parametrize("data,key,file_name,iv,expected", [
+    # 128 bit
+    (b'a\xccT\xf8\xac[\x05\x8e\xe397\xe9\x9b\xaf\xec`\xd9\xa4\xda\xda\x08\x92#\x9fk\x8b=v\x80\xe1Vr', "2b7e151628aed2a6abf7158809cf4f3c", "tmp1.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890'),
+    (b'a\xccT\xf8\xac[\x05\x8e\xe39\x06\xdb\xa8\x9b\xd9V\xd9\xa4\xda\xda\x08\x92#\x9fk\x8b=v\x80\xe1Vt', "2b7e151628aed2a6abf7158809cf4f3c", "tmp2.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890123456'),
+    (b'a\xccT\xf8\xac[\x05\x8e\xe39\x06\xdb\xa8\x9b\xd9V\xee\x9c\xe3\xea\x08\x92#\x9fk\x8b=v\x80\xe1Vt\xa7\x88\x19X?\x03\x08\xe7\xa6\xbf6\xb18j\xbf/', "2b7e151628aed2a6abf7158809cf4f3c", "tmp7.txt", "000102030405060708090a0b0c0d0e0f", b'12345678901234567890'),
+    (b"a\xccT\xf8\xac[\x05\x8e\xe39\x06\xdb\xa8\x9b\xd9V\xee\x9c\xe3\xea9\xa0\x10\xab^\xbd\nN\xb9\xd1gF\x94\xbc,n\x08;1\xd7\xa6\xbf6\xb18j\xbf#\xc6\xd3Am)\x16\\o\xcb\x8eQ\xa2'\xba\x99F", "2b7e151628aed2a6abf7158809cf4f3c", "tmp8.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890123456789012345678901234567890'),
+    # 192 bit
+    (b"\x97;\x80\xb9\xc6\x87$\x05\xe4\xcf'\x18\xba\tV^R\xef\x01\xdaR`/\xe0\x97_x\xac\x84\xbf\x8aV", "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "tmp3.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890'),
+    (b'\x97;\x80\xb9\xc6\x87$\x05\xe4\xcf\x16*\x89=chR\xef\x01\xdaR`/\xe0\x97_x\xac\x84\xbf\x8aP', "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "tmp4.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890123456'),
+    # 256 bit
+    (b'\x86\x8d\ti\xc1\x0f\xbe\xe5\xae\xc0\xfa\x97\xeb\xce/J\xe1\xc6V0^\xd1\xa7\xa6V8\x05to\xe0>\xda', "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "tmp5.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890'),
+    (b'\x86\x8d\ti\xc1\x0f\xbe\xe5\xae\xc0\xcb\xa5\xd8\xfa\x1a|\xe1\xc6V0^\xd1\xa7\xa6V8\x05to\xe0>\xdc', "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "tmp6.txt", "000102030405060708090a0b0c0d0e0f", b'1234567890123456')
+])
+def test_aes_decryption_OFB(data, key, file_name, iv, expected):
+    with open(f"{file_name}.enc", "wb") as file:
+        file.write(data)
+
+    decrypt(key, f"{file_name}.enc", "OFB", iv)
+
+    with open(file_name, "rb") as file:
+        result = file.read()
+
+    os.remove(file_name)
+
+    assert result == expected

src/PyAES/encrypt.py

@@ -26,6 +26,7 @@ def test_aes_encrypt_ECB(data, key, file_name, expected):
 
     assert result == expected
 
+
 @pytest.mark.parametrize("data,key,file_name,iv,expected", [
     # 128 bit
     (b'1234567890', "2b7e151628aed2a6abf7158809cf4f3c", "tmp.txt", "000102030405060708090a0b0c0d0e0f", b'\xe4\xa7\x0e\xbd\x84\xfa\xf5\xd8`\xb8\xa1\x10\x0b~\xadh\x89Feso\xc5~_|\xe9\x1bG\xd9*\\\x81'),
@@ -50,6 +51,7 @@ def test_aes_encrypt_CBC(data, key, file_name, iv, expected):
 
     assert result == expected
 
+
 @pytest.mark.parametrize("data,key,file_name,iv,expected", [
     # 128 bit
     (b'1234567890', "2b7e151628aed2a6abf7158809cf4f3c", "tmp.txt", "000102030405060708090a0b0c0d0e0f", b'\xe4\xa7\x0e\xbd\x84\xfa\xf5\xd8`\xb8\xa1\x10\x0b~\xadhJ\xa98\x9f\xceZ\xd4\x9f"\xde\x00\xf6w\xa9\x1b\x05'),
@@ -72,4 +74,29 @@ def test_aes_encrypt_PCBC(data, key, file_name, iv, expected):
 
     os.remove(f"{file_name}.enc")
 
-    assert result == expected
+    assert result == expected
+
+
+@pytest.mark.parametrize("data,key,file_name,iv,expected", [
+    # 128 bit
+    (b'1234567890', "2b7e151628aed2a6abf7158809cf4f3c", "tmp.txt", "000102030405060708090a0b0c0d0e0f", b'a\xccT\xf8\xac[\x05\x8e\xe397\xe9\x9b\xaf\xec`\xd9\xa4\xda\xda\x08\x92#\x9fk\x8b=v\x80\xe1Vr'),
+    (b'1234567890123456', "2b7e151628aed2a6abf7158809cf4f3c", "tmp1.txt", "000102030405060708090a0b0c0d0e0f", b'a\xccT\xf8\xac[\x05\x8e\xe39\x06\xdb\xa8\x9b\xd9V\xd9\xa4\xda\xda\x08\x92#\x9fk\x8b=v\x80\xe1Vt'),
+    # 192 bit
+    (b'1234567890', "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "tmp2.txt", "000102030405060708090a0b0c0d0e0f", b"\x97;\x80\xb9\xc6\x87$\x05\xe4\xcf'\x18\xba\tV^R\xef\x01\xdaR`/\xe0\x97_x\xac\x84\xbf\x8aV"),
+    (b'1234567890123456', "8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b", "tmp3.txt", "000102030405060708090a0b0c0d0e0f", b'\x97;\x80\xb9\xc6\x87$\x05\xe4\xcf\x16*\x89=chR\xef\x01\xdaR`/\xe0\x97_x\xac\x84\xbf\x8aP'),
+    # 256 bit
+    (b'1234567890', "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "tmp4.txt", "000102030405060708090a0b0c0d0e0f", b'\x86\x8d\ti\xc1\x0f\xbe\xe5\xae\xc0\xfa\x97\xeb\xce/J\xe1\xc6V0^\xd1\xa7\xa6V8\x05to\xe0>\xda'),
+    (b'1234567890123456', "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4", "tmp5.txt", "000102030405060708090a0b0c0d0e0f", b'\x86\x8d\ti\xc1\x0f\xbe\xe5\xae\xc0\xcb\xa5\xd8\xfa\x1a|\xe1\xc6V0^\xd1\xa7\xa6V8\x05to\xe0>\xdc')
+])
+def test_aes_encrypt_OFB(data, key, file_name, iv, expected):
+    with open(file_name, "wb") as file:
+        file.write(data)
+
+    encrypt(key, file_name, "OFB", iv)
+
+    with open(f"{file_name}.enc", "rb") as file:
+        result = file.read()
+
+    os.remove(f"{file_name}.enc")
+
+    assert result == expected

tests/test_decryption.py

@@ -1,31 +1,6 @@
-from matplotlib import pyplot as plt
-
-# Set the figure size
-plt.rcParams["figure.figsize"] = [5.00, 5.00]
-plt.rcParams["figure.autolayout"] = True
-
-
-# Random data points
-#with open("/Users/gabriellindeblad/Documents/GitHub/AES-Python/tmp/test_files/data.txt.enc", "rb") as f:
-#    data = f.read().splitlines()
-#    print(data)
-#    for index, pice in enumerate(data):
-#        data[index] = [i for i in pice]
-
 with open("/Users/gabriellindeblad/Documents/GitHub/AES-Python/tmp/test_files/data.txt.enc", "rb") as f:
     data = f.read()
-    data = [i for i in data]
-    data = [data[x:x+192] for x in range(0, len(data), 192)]
-    #data = data[:-1]
-print(data)
 
 print(data)
+print(len(data))
 
-
-plt.title('adjust axis scale')
-
-# Plot the data using imshow with gray colormap & aspect set to auto
-plt.imshow(data, interpolation=None, cmap="gray", aspect="auto")
-
-# Display the plot
-plt.show()

tests/test_encryption.py

@@ -1,6 +1,14 @@
-with open(r".\tmp\test_files\data.txt.enc", "rb") as p:
-    t = p.read()
-    print(t)
+from PyAES.AES import ofb_dec, ofb_enc
 
-#with open(r"C:\Users\Gabriel\Documents\GitHub\AES-Python\tmp\test_files\data.txt.enc", "wb") as p:
-#    p.write(b'2 ?\xebm\xf5o\xc2\x8b\x90\x80\x84 D\xc4\x95\x89\x18\n\xeb\xac\xde\xa7P>Ei\xbc|\x9c\xfa\xf2')
+def run(val):
+    key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"
+    iv = "000102030405060708090a0b0c0d0e0f"
+    file_path = r"/Users/gabriellindeblad/Documents/GitHub/AES-Python/tmp/test_files/data.txt"
+
+    if val == 1:
+        ofb_enc(key, file_path, iv)
+    elif val == 2:
+        ofb_dec(key, f"{file_path}.enc", iv)
+
+if __name__ == "__main__":
+    run(2)

tmp/test_2.py

@@ -1 +1 @@
-1234567890
+1234567890123456