SwiftGUI_Encryption 0.0.5__tar.gz → 0.0.6__tar.gz

{swiftgui_encryption-0.0.5 → swiftgui_encryption-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SwiftGUI_Encryption
-Version: 0.0.5
+Version: 0.0.6
 Summary: Useful encryption-features for SwiftGUI-applications based on PyCryptoDome
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -31,4 +31,15 @@ I let you use my encryption-schemes, so you won't have to dive deep into cryptog
 
 Also, this package can be used as an addon for SwiftGUI, but doesn't have to be.
 
+# Installation
+Open your terminal and execute this:
+```bash
+pip install SwiftGUI_Encryption
+```
+
+# Dependancies
+This package wouldn't be possible without the following open-source packages:
+- `PyCryptoDome`: A Python-package featuring a lot of cryptography algorithms 
+- `argon2pure`: A small package implementing the argon2-key-derivation algorithm
+
 

{swiftgui_encryption-0.0.5 → swiftgui_encryption-0.0.6}/README.md

@@ -13,3 +13,14 @@ I let you use my encryption-schemes, so you won't have to dive deep into cryptog
 
 Also, this package can be used as an addon for SwiftGUI, but doesn't have to be.
 
+# Installation
+Open your terminal and execute this:
+```bash
+pip install SwiftGUI_Encryption
+```
+
+# Dependancies
+This package wouldn't be possible without the following open-source packages:
+- `PyCryptoDome`: A Python-package featuring a lot of cryptography algorithms 
+- `argon2pure`: A small package implementing the argon2-key-derivation algorithm
+

{swiftgui_encryption-0.0.5 → swiftgui_encryption-0.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "SwiftGUI_Encryption"
-version = "0.0.5"
+version = "0.0.6"
 packages = [
     { include = "SwiftGUI_Encryption", from = "src" }
 ]

{swiftgui_encryption-0.0.5 → swiftgui_encryption-0.0.6}/src/SwiftGUI_Encryption/Advanced/low_level.py

@@ -94,7 +94,7 @@ def encrypt(data: bytes, key: bytes, nonce: bytes, mac_len: int = 8) -> bytes:
 def decrypt(enc_data:bytes, key:bytes, nonce:bytes, mac_len: int = 8) -> bytes:
     """
     Decrypt some data.
-    The tag needs to be appended to the data.
+    The tag needs to be appended to the front of the data.
 
     Raises a value-error if the data was manipulated (tag is invalid)
 
@@ -113,4 +113,3 @@ def decrypt(enc_data:bytes, key:bytes, nonce:bytes, mac_len: int = 8) -> bytes:
     crypter.verify(tag)
 
     return data
-

{swiftgui_encryption-0.0.5 → swiftgui_encryption-0.0.6}/src/SwiftGUI_Encryption/basics.py

@@ -38,16 +38,13 @@ def encrypt_multilayer(data: bytes, *keys: bytes) -> bytes:
     A single AES-256-GCM-encryption is already very secure, even against quantumcomputers.
 
     VERY IMPORTANT:
-    To attack even a 3-layer-encryption is basically impossible.
-    So the attack will be on the keys, not the encryption.
-    Make sure the keys are secure, they are the weakest link.
-
-    Also, don't correlate the keys in any way.
-    If you can calculate key2 from key1, it defies the whole reason for this multilayer-encryption.
+    Don't correlate the keys in any way.
+    If you calculate key2 from key1, you can just leave out key2.
+    DON'T DO SECURITY-BY-OBSCURITY!
 
     KINDA IMPORTANT:
-    Using two keys is only a little better than one key, because someone could do a "meet-in-the-middle-attack".
-    As a general rule, you should use an odd number of keys.
+    Using two keys is only a little more secure than one key, because someone could do a "meet-in-the-middle-attack".
+    As a general rule, you should only use an odd number of keys.
 
     TECHNICALITIES:
     Only the innermost encryption is using AES-GCM Mode. All other layers are AES-CTR.
@@ -60,14 +57,16 @@ def encrypt_multilayer(data: bytes, *keys: bytes) -> bytes:
     :return:
     """
     # GCM encryption
-    data = encrypt_full(data, keys[0])
+    first_nonce = adv.random_key(NONCE_LEN)
+    nonce = first_nonce
+    data = adv.encrypt(data, keys[0], nonce)
 
     # CTR encryptions
     for key in keys[1:]:
-        nonce = adv.random_key(12)
-        data = nonce + adv.encrypt_CTR(data, key, nonce)
+        nonce = adv.make_hash(nonce)[:12]
+        data = adv.encrypt_CTR(data, key, nonce)
 
-    return data
+    return first_nonce + data
 
 def decrypt_multilayer(data: bytes, *keys: bytes) -> bytes:
     """
@@ -77,13 +76,22 @@ def decrypt_multilayer(data: bytes, *keys: bytes) -> bytes:
 
     :return:
     """
+    first_nonce = data[:NONCE_LEN]
+    data = data[NONCE_LEN:]
+
+    nonce = first_nonce
+    nonces = list()
+
+    for i in range(len(keys) - 1):
+        nonce = adv.make_hash(nonce)[:12]
+        nonces.append(nonce)
+
     # CTR encryptions
-    for key in keys[1:][::-1]:
-        nonce = data[:12]
-        data = adv.decrypt_CTR(data[12:], key, nonce)
+    for nonce, key in zip(nonces[::-1], keys[1:][::-1]):
+        data = adv.decrypt_CTR(data, key, nonce)
 
     # GCM encryption
-    return decrypt_full(data, keys[0])
+    return adv.decrypt(data, keys[0], first_nonce)
 
 def encrypt_with_password(data: bytes, password: str, security_multiplier: int = 1) -> bytes:
     """