Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos found by codespell #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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```

Expand Down
12 changes: 6 additions & 6 deletions chainbreaker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion chainbreaker/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down