refactor: SMP improvements

Author: chadsec1

core/constants.py

@@ -82,7 +82,7 @@
 
 # hash parameters
 ARGON2_MEMORY      = 1 * 1024**3   # GB
-ARGON2_ITERS       = 4
+ARGON2_ITERS       = 25
 ARGON2_OUTPUT_LEN  = 64           # bytes
 ARGON2_SALT_LEN    = 16           # bytes (Must be always 16 for interoperability with implementations using libsodium.)
 ARGON2_LANES       = 4

ui/smp_question_window.py

@@ -19,14 +19,27 @@ def __init__(self, master, contact_id, question):
 
 
         self.title("Answer Verification Question")
-        self.geometry("400x200")
+        self.geometry("440x240")
         self.configure(bg="black")
 
+        # Warning label
+        tk.Label(
+            self,
+            text=f"`{contact_id}` wants to verify you.\nCommunicate out-of-band if you don't know an answer.",
+            fg="white",
+            bg="black",
+            font=("Helvetica", 10),
+            wraplength=380,
+            justify="left"
+        ).pack(pady=(10, 10))
+
+
+        tk.Label(self, text="Question:",  font=("Helvetica", 11), fg="white", bg="black", anchor="w").pack(fill="x", padx=20)
         # Question label
         # :SMP_QUESTION_MAX_LEN to ensure no weird visual effects or even bufferoverflows can be exploited in the underlying tkinter library.
         tk.Label(
             self,
-            text="Question: " + question[:SMP_QUESTION_MAX_LEN],
+            text=question[:SMP_QUESTION_MAX_LEN],
             fg="white",
             bg="black",
             font=("Helvetica", 10),
@@ -63,6 +76,7 @@ def submit(self):
             messagebox.showerror("Error", "You need to provide an answer.")
             return
 
+        self.destroy()
+
         smp_step_4_answer_provided(self.master.user_data, self.master.user_data_lock, self.contact_id, answer, self.master.ui_queue)
 
-        self.destroy()

ui/smp_setup_window.py

@@ -23,7 +23,7 @@ def __init__(self, master, contact_id):
         # Instructions label
         tk.Label(
             self,
-            text="Pick a question that only you and your contact would know.\nCommunicate out-of-band if needed. Avoid anything guessable. No birthdays. No public facts.",
+            text="Ask a question that only you and your contact would know.\nCommunicate out-of-band if needed. Avoid anything guessable. No birthdays. No public facts.",
             fg="white",
             bg="black",
             font=("Helvetica", 10),