Update msg_encX.py

msg_encX.py

@@ -9,11 +9,13 @@ from Crypto.Cipher import AES
 import rsa
 import string
 
-encoding = int(os.environ['encoding'])
-padding = int(os.environ['padding'])
-encryption_difficulty = int(os.environ['encryption_difficulty'])
+encoding0 = int(os.environ['encoding'])
+padding0 = int(os.environ['padding'])
+encryption_difficulty0 = int(os.environ['encryption_difficulty'])
+N_days0=int(os.environ['N_days'])
+User_passcode0=int(os.environ['User_passcode'])
 
-def seedx(path , User_passcode=int(os.environ['User_passcode']), N_days=int(os.environ['N_days']), encryption_difficulty = encryption_difficulty):
+def seedx(path , User_passcode=User_passcode0, N_days=N_days0, encryption_difficulty = encryption_difficulty0):
   try:
     with open(path +'indx.txt') as f:
       old_day_index = int(f.read())
@@ -46,7 +48,7 @@ def seedx(path , User_passcode=int(os.environ['User_passcode']), N_days=int(os.e
   return {'seed':seed,'publicKey': publicKey, 'privateKey': privateKey}
 
 
-def AES_encrypt(User_message,seed, publicKey,encoding = int(os.environ['encoding']), padding = int(os.environ['padding'])):
+def AES_encrypt(User_message,seed, publicKey,encoding = encoding0, padding = padding0):
   #number conversion to encrypt non-english content
   User_message_numbered = (int.from_bytes(bytes(User_message, 'utf-16'), "big"))
   #padding
@@ -93,7 +95,7 @@ class AESCipher(object):
 def invert_perm_list(p):
     return [p.index(l) for l in range(len(p))]
 
-def AES_decrypt(encMessage,seed,publicKey, encoding = 1, encryption_difficulty = 2**10, padding = 30):
+def AES_decrypt(encMessage,seed,publicKey, encoding = encoding0, encryption_difficulty = encryption_difficulty0, padding = padding0):
   if encoding == 0:
     encMessage_byte = encMessage
   elif encoding == 1:
@@ -117,7 +119,7 @@ def AES_decrypt(encMessage,seed,publicKey, encoding = 1, encryption_difficulty =
 def Encrypt_msg(User_message,user_password,path):
     User_passcode = (int.from_bytes(bytes(str(user_password), 'utf-8'), "little"))
     Num_dict_enc = seedx(path, User_passcode)
-    encMessage_i = AES_encrypt(User_message,Num_dict_enc['seed'], Num_dict_enc['publicKey'],encoding = 1, padding = 30)
+    encMessage_i = AES_encrypt(User_message,Num_dict_enc['seed'], Num_dict_enc['publicKey'],encoding = encoding0, padding = padding0)
     #print(encMessage_i)
     return encMessage_i
 
@@ -125,6 +127,6 @@ def Encrypt_msg(User_message,user_password,path):
 def Decrypt_msg(encMessage,user_password,path):
     User_passcode = (int.from_bytes(bytes(str(user_password), 'utf-8'), "little"))
     Num_dict_enc = seedx(path, User_passcode)
-    recovered_msg = AES_decrypt(encMessage,Num_dict_enc['seed'], Num_dict_enc['publicKey'], encoding = 1, encryption_difficulty = 2**10, padding = 30)
+    recovered_msg = AES_decrypt(encMessage,Num_dict_enc['seed'], Num_dict_enc['publicKey'], encoding = encoding0, encryption_difficulty = encryption_difficulty0, padding = padding0)
     #print(recovered_msg)
     return recovered_msg