commit acb86ef03c07ead350c7f20deaa2620021488f96 parent 5aeca350228b129c28c41482681a191fa26c898b Author: therealFIGBERT <figbertwelner@gmail.com> Date: Mon, 30 Sep 2019 00:13:26 -0700 2.3.5 Diffstat:
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/Executables/figENC.dmg b/Executables/figENC.dmg Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/MacOS/_struct/cpython-37m-darwin/sotruct.cpython-37m-darwin.so b/Executables/figENC_MacOS/figENC.app/Contents/MacOS/_struct/cpython-37m-darwin/sotruct.cpython-37m-darwin.so Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/MacOS/_uuid.cpython-37m-darwin.so b/Executables/figENC_MacOS/figENC.app/Contents/MacOS/_uuid.cpython-37m-darwin.so Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/MacOS/base_library.zip b/Executables/figENC_MacOS/figENC.app/Contents/MacOS/base_library.zip Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/MacOS/figENC b/Executables/figENC_MacOS/figENC.app/Contents/MacOS/figENC Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/MacOS/zlib/cpython-37m-darwin/soib.cpython-37m-darwin.so b/Executables/figENC_MacOS/figENC.app/Contents/MacOS/zlib/cpython-37m-darwin/soib.cpython-37m-darwin.so Binary files differ. diff --git a/Executables/figENC_MacOS/figENC.app/Contents/Resources/version.txt b/Executables/figENC_MacOS/figENC.app/Contents/Resources/version.txt @@ -1 +1 @@ -2.3.4 -\ No newline at end of file +2.3.5 +\ No newline at end of file diff --git a/Scripts/check.py b/Scripts/check.py @@ -78,7 +78,7 @@ def key_enc(files, pass1, pass2, key_dir): if broken_paths != "": prompts.file_access_error(broken_paths) if not password_match: - prompts.password_error(pass1, pass2) + prompts.password_error() if not key_dir_access: prompts.key_dir_error(key_dir) return False @@ -166,7 +166,7 @@ def key(key_dir, pass1, pass2): if not key_dir_access: prompts.key_dir_error(key_dir) if not password_match: - prompts.password_error(pass1, pass2) + prompts.password_error() return False @@ -238,11 +238,11 @@ def dec(files, pass1, pass2, key_dir): if not key_dir_access: prompts.key_dir_error(key_dir) if not password_match: - prompts.password_error(pass1, pass2) + prompts.password_error() if not proper_keys: prompts.missing_keys(key_dir) if not correct_pass: - prompts.wrong_pass(pass1) + prompts.wrong_pass() return False diff --git a/Scripts/prompts.py b/Scripts/prompts.py @@ -18,15 +18,13 @@ def overwrite_prompt(): ) ) -def password_error(one, two): +def password_error(): """"Raise an error informing the user that the provided passwords do not match. """ messagebox.showwarning( "Passwords Do Not Match", - ("The passwords provided do not match. Please Try again." - "\n\nFirst: {}\nSecond: {}".format(one, two) - ) + "The passwords provided do not match. Please try again." ) def encrypted_keys(): @@ -85,13 +83,10 @@ def missing_keys(folder): ) ) -def wrong_pass(passkey): +def wrong_pass(): messagebox.showwarning( "Incorrect Password", - ( - "The password provided is incorrect. Please try again." - "\n\nPassword:\n%s" % passkey - ) + "The password provided is incorrect. Please try again." ) def success(mode): diff --git a/Scripts/version.txt b/Scripts/version.txt @@ -1 +1 @@ -2.3.4 -\ No newline at end of file +2.3.5 +\ No newline at end of file