From c819a20b792ad58ecca1889a8b61c3ce88339190 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Fri, 7 Apr 2023 08:39:24 +0200 Subject: [PATCH] Fix typos found by codespell --- README.md | 2 +- chainbreaker/__init__.py | 12 ++++++------ chainbreaker/results.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 637e354..6e690e8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This creates a wheel file (extension: `.whl`) in the `/dist` folder. 3) Install the wheelfile with pip, or (if in the same directory containing `setup.py`) run: `$ pip install -e .` ### Running chainbreaker as a module -After succesfully installing the wheelfile, you can use the module from the command-line (allowing you to use input arguments) as follows: +After successfully installing the wheelfile, you can use the module from the command-line (allowing you to use input arguments) as follows: ```$ python -m chainbreaker``` diff --git a/chainbreaker/__init__.py b/chainbreaker/__init__.py index 0ab8c7b..2d6224f 100644 --- a/chainbreaker/__init__.py +++ b/chainbreaker/__init__.py @@ -405,17 +405,17 @@ def _find_wrapping_key(self, master): # return encrypted wrapping key return dbkey - # Extract the Cyphertext, IV, and Salt for the keychain file, for use with offline cracking (e.g. Hashcat) + # Extract the Ciphertext, IV, and Salt for the keychain file, for use with offline cracking (e.g. Hashcat) # Returns a KeychainPasswordHash object def dump_keychain_password_hash(self): - cyphertext = hexlify(self.kc_buffer[self.base_addr + ciphertext = hexlify(self.kc_buffer[self.base_addr + self.dbblob.StartCryptoBlob:self.base_addr + self.dbblob.TotalLength]) iv = hexlify(self.dbblob.IV) salt = hexlify(self.dbblob.Salt) - return self.KeychainPasswordHash(salt, iv, cyphertext) + return self.KeychainPasswordHash(salt, iv, ciphertext) # Given a base address and offset (ID) of a record, def _get_appleshare_record(self, record_offset): @@ -807,16 +807,16 @@ def file_ext(self): class KeychainPasswordHash(KeychainRecord): KEYCHAIN_PASSWORD_HASH_FORMAT = "$keychain$*%s*%s*%s" - def __init__(self, salt, iv, cyphertext): + def __init__(self, salt, iv, ciphertext): self.salt = salt self.iv = iv - self.cypher_text = cyphertext + self.cipher_text = ciphertext Chainbreaker.KeychainRecord.__init__(self) def __str__(self): return Chainbreaker.KeychainPasswordHash.KEYCHAIN_PASSWORD_HASH_FORMAT % ( - self.salt, self.iv, self.cypher_text) + self.salt, self.iv, self.cipher_text) @property def exportable(self): diff --git a/chainbreaker/results.py b/chainbreaker/results.py index a82a056..e93cf60 100644 --- a/chainbreaker/results.py +++ b/chainbreaker/results.py @@ -99,7 +99,7 @@ def resolve(args, keychain): def log_output(output, summary_output, args): - # Print all parsed records from output until the end or until keyboard intterupt is given + # Print all parsed records from output until the end or until keyboard interrupt is given try: for record_collection in output: if 'records' in record_collection: