Update app.py

app.py

@@ -228,9 +228,12 @@ def encrypt(passw,trans_s=None,trans_r=None,trans_a=None):
         recipient_key = RSA.import_key(open("receiver.pem").read())
 
         cipher_rsa = PKCS1_OAEP.new(recipient_key)
-        json_bytes = cipher_rsa.encrypt(bytes_j)
-        #json_bytes = fernet.encrypt(bytes_j)
-        enc_mes = f'{json_bytes}+ccc+'
+        #json_bytes = cipher_rsa.encrypt(bytes_j)
+        #json_key = cipher_rsa.encrypt(key)
+
+        
+        json_bytes = fernet.encrypt(bytes_j)
+        enc_mes = f'{json_bytes}+ccc+{json_key}+ddd+'
         print(f'enc_mes out:: {enc_mes}')
     #enc_qr = qr.make_qr(txt=(enc_mes.strip('"')))
     m = hashlib.sha256()
@@ -320,17 +323,52 @@ def decrypt(passw,enc_in=None):
                 mes14=mes4.strip("b'").strip("'")
                 json_bytes = bytes(mes14,'utf-8')
                 print(f'im_bytes::{json_bytes}')
-                private_key = RSA.import_key(open("private.pem").read())
+                #private_key = RSA.import_key(open("private.pem").read())
 
-                cipher_rsa = PKCS1_OAEP.new(private_key)
-                dec_json = cipher_rsa.decrypt(json_bytes).decode()
-                print("done")
+                #cipher_rsa = PKCS1_OAEP.new(private_key)
+                #dec_json = cipher_rsa.decrypt(json_bytes).decode()
+                #print("done")
                 
-                #dec_json = fernet.decrypt(json_bytes).decode()       
+                dec_json = fernet.decrypt(json_bytes).decode()       
+                    
+    
+    return(dec_im, mes_dec, dec_json)
+def decrypt_json(passw,enc_in=None):
+    key = create_key(passw)
+    fernet = Fernet(key)
+    dec_im = None
+    mes_dec= None
+    dec_json=None
+    enc_in=enc_in.strip('"')
+    print (f'enc_in :::: {enc_in}')
 
+    if "+ccc+" in enc_in:
+        if "+ddd+" in enc_in:
+            mes15=enc_in.split("+ccc+",1)[1]
+            mes5=mes15.split("+ddd+",1)[0]
+            mes5=mes5.strip("b'").strip("'")
+            json_bytes = bytes(mes5,'utf-8')
+            
+            private_key = RSA.import_key(open("private.pem").read())
+            cipher_rsa = PKCS1_OAEP.new(private_key)
+            key = cipher_rsa.decrypt(json_bytes).decode()        
+            print (f'New Key:: {key}')
+        fernet = Fernet(key)
+        mes4=enc_in.split("+ccc+",1)[0]
+        mes14=mes4.strip("b'").strip("'")
+        json_bytes = bytes(mes14,'utf-8')
+        print(f'json_bytes22::{json_bytes}')
+
+        #print("done")
+        
+        dec_json = fernet.decrypt(json_bytes).decode()       
+
+            
     
     return(dec_im, mes_dec, dec_json)
 
+
+    
 def decode_doc(passw,doc=None):
     key = create_key(passw)
     fernet = Fernet(key)