not working trab 4

trabalho4/client.py

@@ -12,16 +12,16 @@ def register_user(username, password):
     global CLIENT_ID, KEY
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((HOST, AS_PORT))
-        key = os.urandom(32)
-        message = f"register||{username}<>{password}<>{key}"
+        message = f"register||{username}<>{password}"
         s.sendall(message.encode())
         data = s.recv(4096)
 
         data = data.decode()
-        if data == "success":
+        data = data.split("<>")
+        if data[0] == "success":
             print("Login succeeded!")
             CLIENT_ID = username
-            KEY = key
+            KEY = eval(data[1])
 
 def login(username, password):
     global CLIENT_ID, KEY
@@ -36,7 +36,7 @@ def login(username, password):
         if data[0] == "success":
             print(f"Login succeeded!")
             CLIENT_ID = username
-            KEY = data[1]
+            KEY = eval(data[1])
 
 def print_something():
     global CLIENT_ID, KEY
@@ -45,7 +45,7 @@ def print_something():
         print("You must register or login first!")
         return
 
-    AES = AESCipher(C_User_Key)
+    AES = AESCipher(KEY)
 
     ID_C = CLIENT_ID
     ID_S = "PRINTER"
@@ -63,12 +63,12 @@ def print_something():
     message = f"request||{M1}"
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((HOST, AS_PORT))
-        print('sending m1', message)
+        print('Sending M1', message)
         s.sendall(message.encode())
 
         data = s.recv(4096)
         data = data.decode()
-        print('received m2', data)
+        print('Received M2', data)
         M2 = data
 
     '''
@@ -92,12 +92,12 @@ def print_something():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((HOST, TGS_PORT))
         message = f"request||{M3}"
-        print('sending m3', message)
+        print('Sending M3', message)
         s.sendall(message.encode())
 
         data = s.recv(4096)
         data = data.decode()
-        print('received m4', data)
+        print('Received M4', data)
         M4 = data
 
     '''
@@ -109,7 +109,6 @@ def print_something():
     M4_AES = AESCipher(K_c_tgs)
     M4_inner = M4_AES.decrypt(M4[0])
     M4_inner = M4_inner.split("<>")
-    print('M4_inner', M4_inner)
 
     K_c_s = eval(M4_inner[0])
     T_A = M4_inner[1]
@@ -127,12 +126,12 @@ def print_something():
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((HOST, SERVICE_PORT))
         message = f"request||{M5}"
-        print('sending m5', message)
+        print('Sending M5', message)
         s.sendall(message.encode())
 
         data = s.recv(4096)
         data = data.decode()
-        print('received m6', data)
+        print('Received M6', data)
         M6 = data
 
     '''