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

Sourcery refactored master branch #1

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
18 changes: 9 additions & 9 deletions crc_spoof.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,36 @@ def modify_buffer_crc32(buffer, offset, newcrc, printstatus=False):
crc = get_buffer_crc32(buffer)
if printstatus:
print("Buffer CRC-32: {:08X}".format(reverse32(crc)))

# Compute the change to make
delta = crc ^ newcrc
delta = multiply_mod(reciprocal_mod(pow_mod(2, (length - offset) * 8)), delta)

# Patch 4 bytes in the buffer
bytes4 = bytearray(buffer[offset:offset+4])
if len(bytes4) != 4:
raise IOError("Cannot read 4 bytes at offset")

if printstatus:
print("Target bytes @ offset: {:s}".format(str(bytes4).encode('hex')))

for i in range(4):
bytes4[i] ^= (reverse32(delta) >> (i * 8)) & 0xFF

if printstatus:
print("Patched value: {:s}".format(str(bytes4).encode('hex')))

result = str(buffer[0:offset] + bytes4 + buffer[offset+4:])
result = str(buffer[:offset] + bytes4 + buffer[offset+4:])

if printstatus:
print("Computed and wrote patch")

# Recheck entire file
if get_buffer_crc32(result) != newcrc:
raise AssertionError("Failed to update CRC-32 to desired value")
elif printstatus:
print("New CRC-32 successfully verified")

Comment on lines -39 to +68
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function modify_buffer_crc32 refactored with the following changes:

return result

# Public library function. path is str/unicode, offset is uint, newcrc is uint32, printstatus is bool.
Expand Down Expand Up @@ -126,7 +126,7 @@ def get_file_crc32(raf):

def reverse32(x):
y = 0
for i in range(32):
for _ in range(32):
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function reverse32 refactored with the following changes:

y = (y << 1) | (x & 1)
x >>= 1
return y
Expand Down
2 changes: 1 addition & 1 deletion poc.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
crc32 = get_buffer_crc32(buffer)

# replace the pointer (usb_data + 0x78)
buffer = buffer[0:8] + pack('<Q', bad_ptr)
buffer = buffer[:8] + pack('<Q', bad_ptr)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines 60-60 refactored with the following changes:


# spoof crc32, first 4 bytes will be modified
buffer = modify_buffer_crc32(buffer, 0, crc32)
Expand Down