diff --git a/communication/client.py b/communication/client.py index 75513abdd89ff423baed85ce91d278c40622f4c3..66d88869bbfdc0c300f9c77f58b8f3cdf5791393 100644 --- a/communication/client.py +++ b/communication/client.py @@ -46,7 +46,7 @@ def send_message_to_server(host, port, algorithm, key, key_length, encrypted_mes data = { 'algorithm': algorithm, 'key_length': key_length, - 'key': base64.b64encode(key).decode('utf-8'), # Symmetrischer Schlüssel als base64 (Klartext) + 'key': key.hex(), 'encrypted_message': encrypted_message } diff --git a/communication/server.py b/communication/server.py index a85ffcfe4d8a383bf58b0efc8cf2fbfc04bdd5cf..f7363f6a219b13c17f25062f93f30a3225a05638 100644 --- a/communication/server.py +++ b/communication/server.py @@ -58,7 +58,7 @@ def handle_client(conn, addr): data = json.loads(data) algorithm = data['algorithm'] key_length = data['key_length'] - key = base64.b64decode(data['key']) # Symmetrischer Schlüssel als base64 (Klartext) + key = bytes.fromhex(data['key']) encrypted_message = data['encrypted_message'] logging.info(f"Algorithm: {algorithm}, Key Length: {key_length}") except json.JSONDecodeError as e: @@ -69,14 +69,6 @@ def handle_client(conn, addr): # Decrypt the message using the key decrypted_message = decrypt_message(algorithm, key, encrypted_message) logging.info(f"Decrypted message from client {addr}: {decrypted_message}") - - # Respond to the client - response = { - "status": "success", - "decrypted_message": decrypted_message - } - conn.sendall(json.dumps(response).encode()) - logging.info(f"Sent response to client {addr}") # Define server configuration def main():