From 914fc855966833f178563e94e86739449a82f4ad Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 7 Jul 2023 00:09:10 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Rename=20refs:=20Master=20->=20P?= =?UTF-8?q?rimary?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firefox_decrypt.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/firefox_decrypt.py b/firefox_decrypt.py index 5ad6423..39098de 100755 --- a/firefox_decrypt.py +++ b/firefox_decrypt.py @@ -100,8 +100,8 @@ class Exit(Exception): FAIL_INIT_NSS = 12 FAIL_NSS_KEYSLOT = 13 FAIL_SHUTDOWN_NSS = 14 - BAD_MASTER_PASSWORD = 15 - NEED_MASTER_PASSWORD = 16 + BAD_PRIMARY_PASSWORD = 15 + NEED_PRIMARY_PASSWORD = 16 DECRYPTION_FAILED = 17 PASSSTORE_NOT_INIT = 20 @@ -455,12 +455,12 @@ class NSSProxy: if err_status: self.handle_error( - Exit.BAD_MASTER_PASSWORD, - "Master password is not correct", + Exit.BAD_PRIMARY_PASSWORD, + "Primary password is not correct", ) else: - LOG.info("No Master Password found - no authentication needed") + LOG.info("No Primary Password found - no authentication needed") finally: # Avoid leaking PK11KeySlot self._PK11_FreeSlot(keyslot) @@ -521,7 +521,7 @@ class MozillaInteraction: self.proxy.initialize(self.profile) def authenticate(self, interactive): - """Authenticate the the current profile is protected by a master password, + """Authenticate the the current profile is protected by a primary password, prompt the user and unlock the profile. """ self.proxy.authenticate(self.profile, interactive) @@ -805,12 +805,12 @@ def ask_password(profile: str, interactive: bool) -> str: Prompt for profile password """ passwd: str - passmsg = f"\nMaster Password for profile {profile}: " + passmsg = f"\nPrimary Password for profile {profile}: " if sys.stdin.isatty() and interactive: passwd = getpass(passmsg) else: - sys.stderr.write("Reading Master password from standard input:\n") + sys.stderr.write("Reading Primary password from standard input:\n") sys.stderr.flush() # Ability to read the password from stdin (echo "pass" | ./firefox_...) passwd = sys.stdin.readline().rstrip("\n")