averello/firefox_decrypt-mirror
1
0
Fork 0
mirror of https://github.com/unode/firefox_decrypt.git synced 2025-12-16 12:01:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Rename refs: Master -> Primary

Browse Source
This commit is contained in:
Renato Alves
2023-07-07 00:09:10 +02:00
parent 297112af45
commit 914fc85596
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firefox_decrypt.py
View File

@@ -100,8 +100,8 @@ class Exit(Exception):
FAIL_INIT_NSS = 12 FAIL_INIT_NSS = 12
FAIL_NSS_KEYSLOT = 13 FAIL_NSS_KEYSLOT = 13
FAIL_SHUTDOWN_NSS = 14 FAIL_SHUTDOWN_NSS = 14
BAD_MASTER_PASSWORD = 15 BAD_PRIMARY_PASSWORD = 15
NEED_MASTER_PASSWORD = 16 NEED_PRIMARY_PASSWORD = 16
DECRYPTION_FAILED = 17 DECRYPTION_FAILED = 17
PASSSTORE_NOT_INIT = 20 PASSSTORE_NOT_INIT = 20
@@ -455,12 +455,12 @@ class NSSProxy:
if err_status: if err_status:
self.handle_error( self.handle_error(
Exit.BAD_MASTER_PASSWORD, Exit.BAD_PRIMARY_PASSWORD,
"Master password is not correct", "Primary password is not correct",
) )
else: else:
LOG.info("No Master Password found - no authentication needed") LOG.info("No Primary Password found - no authentication needed")
finally: finally:
# Avoid leaking PK11KeySlot # Avoid leaking PK11KeySlot
self._PK11_FreeSlot(keyslot) self._PK11_FreeSlot(keyslot)
@@ -521,7 +521,7 @@ class MozillaInteraction:
self.proxy.initialize(self.profile) self.proxy.initialize(self.profile)
def authenticate(self, interactive): 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. prompt the user and unlock the profile.
""" """
self.proxy.authenticate(self.profile, interactive) self.proxy.authenticate(self.profile, interactive)
@@ -805,12 +805,12 @@ def ask_password(profile: str, interactive: bool) -> str:
Prompt for profile password Prompt for profile password
""" """
passwd: str passwd: str
passmsg = f"\nMaster Password for profile {profile}: " passmsg = f"\nPrimary Password for profile {profile}: "
if sys.stdin.isatty() and interactive: if sys.stdin.isatty() and interactive:
passwd = getpass(passmsg) passwd = getpass(passmsg)
else: else:
sys.stderr.write("Reading Master password from standard input:\n") sys.stderr.write("Reading Primary password from standard input:\n")
sys.stderr.flush() sys.stderr.flush()
# Ability to read the password from stdin (echo "pass" | ./firefox_...) # Ability to read the password from stdin (echo "pass" | ./firefox_...)
passwd = sys.stdin.readline().rstrip("\n") passwd = sys.stdin.readline().rstrip("\n")