Update crypt.py

crypt.py

@@ -332,28 +332,36 @@ def encrypt_trans(data,pub_key):
 
 
 def decrypt_trans(data,key):
-    secret_code="SECRET PASSWORD"
-    #priv_key = decode(priv_im)
-    print(f'priv_key:: {priv_key}')
-    #key = RSA.import_key(priv_key,passphrase=secret_code)
-    
-    public_key = key.publickey().export_key('PEM')
-    file_out_pub = open("receiver.pem", "wb")
-    file_out_pub.write(public_key)
-    file_out_pub.close()
-
-
-    hash_1 = calculate_hash(public_key, hash_function="sha256")
-    hash_2 = calculate_hash(hash_1, hash_function="ripemd160")
-    address = base58.b58encode(hash_2)
-    address= str(address)
-    print (address)
-    address = address.strip("b")
-    print (address)
-    address = address.strip("'") if address.startswith("'") else address.strip('"')
-    print (address)
+    enc_in = data
+    priv_key = key
+    #enc_in = decode(im)
+    #secret_code="SECRET PASSWORD"
+    ##private_key = RSA.import_key(open("private.pem").read())
+    #priv_key = decode(in2)
+    #print(f'priv_key:: {priv_key}')
+    #private_key = RSA.import_key(priv_key,passphrase=secret_code)
+    print(f'private_key:: {private_key}')
+    enc_session_key = enc_in[:private_key.size_in_bytes()]
+    end1 = private_key.size_in_bytes()+16
+    nonce = enc_in[private_key.size_in_bytes():end1]
+    start1=end1+1
+    end2 = private_key.size_in_bytes()+32
+    start2=end2+1
+    tag = enc_in[end1:end2]
+    ciphertext = enc_in[end2:]
+    print (f'enc_session_key::{enc_session_key}')
+    print (f'nonce::{nonce}')
+    print (f'tag::{tag}')
+    print (f'ciphertext::{ciphertext}')    
 
-    return (address)
+    # Decrypt the session key with the private RSA key
+    cipher_rsa = PKCS1_OAEP.new(private_key)
+    session_key = cipher_rsa.decrypt(enc_session_key)
+    
+    # Decrypt the data with the AES session key
+    cipher_aes = AES.new(session_key, AES.MODE_EAX, nonce)
+    data = cipher_aes.decrypt_and_verify(ciphertext, tag)
+    return(data.decode("utf-8"))
 
 ########********************************###########################