Merge pull request #15 from Scratchcat1/Simple-Connection

Simple connection

AATC_Client_Text_UI.py

@@ -361,17 +361,14 @@ def GetMonitorPermissionUser(self):
     #################################################
 
     def Call_Exit(self):
-        Choice = input("Exit? (Y/N) >>").upper()
-        if Choice == "Y":
-            print("Exiting..")
-            try:
-                Sucess,Message = self.UserInterface.Exit()
-                self.DisplayResults(Sucess,Message)
-            except:
-                print("Unable to close server connection")
-            self.Exit = True
-        else:
-            print("Exit cancelled")
+        print("Exiting..")
+        try:
+            Sucess,Message = self.UserInterface.Exit()
+            self.DisplayResults(Sucess,Message)
+        except:
+            print("Unable to close server connection")
+        self.Exit = True
+
 
 
 
@@ -386,7 +383,13 @@ def Call_Exit(self):
 
             TextUI = UserTextUI(U,MenuOptions)
             TextUI.Main_Loop()
-            Exit = True  #When user selects exit
+
+            Choice = input("Exit? (Y/N) >>").upper()
+            if Choice == "Y":
+                print("Exiting")
+                Exit = True  #When user selects exit
+            else:
+                print("Exit cancelled")
 
         except Exception as e:
             print("Error occured creating user interface",e)

AATC_Config.py

@@ -14,3 +14,6 @@
 
 
 DRONE_BATTERY_DRAIN_MULT = 1
+
+
+NOFLYZONE_THRESHOLD_COST = 50

AATC_Crypto.py

@@ -81,14 +81,15 @@ def ServerGenerateKey(self):
 
             if Command == "ExchangeKey":
                 publicKey,AES_KeySize = Arguments[0],Arguments[1]
+
                 if AES_KeySize not in AATC_Config.ALLOWED_AES_KEYSIZES:
                     AES_KeySize = AATC_Config.DEFAULT_AES_KEYSIZE    #If key size is not valid set size to default of AATC_Config.DEFAULT_AES_KEYSIZE
 
                 self.AESKey = binascii.b2a_hex(os.urandom(AES_KeySize//2))  # Here to allow regeneration of AES key while still in loop if required.
-                self.IV = binascii.b2a_hex(os.urandom(AES_KeySize//2)) 
+                self.IV     = binascii.b2a_hex(os.urandom(AES_KeySize//2)) 
 
-                RSAPrivateKey = RSA.import_key(publicKey)
-                PublicKeyObject = PKCS1_OAEP.new(RSAPrivateKey)
+                RSAPublicKey = RSA.import_key(publicKey)
+                PublicKeyObject = PKCS1_OAEP.new(RSAPublicKey)
 
                 EncryptedAESKey = PublicKeyObject.encrypt(self.AESKey)
                 EncryptedIV = PublicKeyObject.encrypt(self.IV)
@@ -136,6 +137,5 @@ def Send(self,data):
     def Recv(self):
         data = recvall.recvall(self.con)
         data = ast.literal_eval(codecs.decode(data))
-        #      (Command,Arguments)
         return data