refactor: code cleanup

Author: chadsec1

core/crypto.py

@@ -19,12 +19,7 @@
     OTP_MAX_RANDOM_PAD,
     OTP_SIZE_LENGTH,
     OTP_MAX_BUCKET,
-    ML_KEM_1024_SK_LEN,
-    ML_KEM_1024_PK_LEN,
     ML_DSA_87_NAME,
-    ML_DSA_87_SK_LEN,
-    ML_DSA_87_PK_LEN,
-    ML_DSA_87_SIGN_LEN,
     ALGOS_BUFFER_LIMITS
 )
 

core/requests.py

@@ -1,4 +1,4 @@
-from urllib import request, error
+from urllib import request
 from core.trad_crypto import (
     sha3_512
 )

logic/background_worker.py

@@ -1,5 +1,5 @@
 from core.requests import http_request
-from logic.smp import smp_unanswered_questions, smp_data_handler
+from logic.smp import smp_data_handler
 from logic.pfs import pfs_data_handler
 from logic.message import messages_data_handler
 from logic.user import validate_identifier
@@ -10,17 +10,15 @@
     SMP_TYPES,
     PFS_TYPES,
     MSG_TYPES,
-    XCHACHA20POLY1305_NONCE_LEN,
-    ML_KEM_1024_CT_LEN
+    XCHACHA20POLY1305_NONCE_LEN
 )
 from core.crypto import (
-        random_number_range,
-        decap_shared_secret
+        random_number_range
 )
 from core.trad_crypto import (
         decrypt_xchacha20poly1305
 )
-from base64 import b64decode, urlsafe_b64encode
+from base64 import urlsafe_b64encode
 import copy
 import logging
 

logic/message.py

@@ -40,7 +40,6 @@
     XCHACHA20POLY1305_NONCE_LEN
 
 )
-from base64 import b64decode, b64encode
 import secrets
 import logging
 
@@ -224,7 +223,7 @@ def send_message_processor(user_data, user_data_lock, contact_id: str, message:
             headers = session_headers, 
             auth_token = auth_token
         )
-    except:
+    except Exception:
         ui_queue.put({"type": "showerror", "title": "Error", "message": "Failed to send our message to the server"})
         return False
 

logic/pfs.py

@@ -15,8 +15,7 @@
 from core.crypto import (
     generate_kem_keys,
     verify_signature,
-    create_signature,
-    random_number_range
+    create_signature
 )
 from core.constants import (
     PFS_TYPES,
@@ -32,8 +31,7 @@
 )
 from core.trad_crypto import (
         sha3_512,
-        encrypt_xchacha20poly1305,
-        decrypt_xchacha20poly1305
+        encrypt_xchacha20poly1305
 )
 from base64 import b64encode, b64decode
 import secrets

logic/smp.py

@@ -33,7 +33,6 @@
         SMP_TYPES,
         SMP_NONCE_LENGTH,
         SMP_PROOF_LENGTH,
-        SMP_QUESTION_MAX_LEN,
         SMP_ANSWER_OUTPUT_LEN,
         ARGON2_SALT_LEN,
         ML_KEM_1024_NAME,
@@ -398,9 +397,6 @@ def smp_step_4_answer_provided(user_data, user_data_lock, contact_id, answer, ui
 
 def smp_step_5(user_data, user_data_lock, contact_id, smp_plaintext, ui_queue) -> None:
     with user_data_lock:
-        server_url = user_data["server_url"]
-        auth_token = user_data["token"]
-
         answer = user_data["contacts"][contact_id]["lt_sign_key_smp"]["answer"]
 
         our_signing_public_key = user_data["contacts"][contact_id]["lt_sign_keys"]["our_keys"]["public_key"]

tests/test_crypto.py

@@ -36,7 +36,6 @@
     CLASSIC_MCELIECE_8_F_CT_LEN 
 
 )
-from core.trad_crypto import sha3_512
 
 
 def test_random_number_range():

tests/test_requests.py

@@ -11,7 +11,6 @@
 import pytest
 import socket
 import json
-import types
 import socks
 from urllib import request as urllib_request
 from core import requests as core_requests

tests/test_trad_crypto.py

@@ -46,5 +46,5 @@ def test_aes_encrypt_decrypt():
     tampered_ciphertext[-1] ^= 0xFF  # Flip last byte to corrupt data
 
     with pytest.raises(Exception):
-        decrypt_aes_gcm(key, nonce, bytes(tampered_ciphertext))
+        decrypt_xchacha20poly1305(key, nonce, bytes(tampered_ciphertext))
 

ui/add_contact_prompt.py

@@ -1,5 +1,7 @@
 from tkinter import messagebox
-from ui.utils import *
+from ui.utils import (
+        enhanced_entry
+)
 from logic.user import validate_identifier 
 from logic.contacts import save_contact
 from logic.storage import save_account_data