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.

Sign up for GitHub

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

Convert to Python 3 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Open

Convert to Python 3 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions open_bump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

#
# Copyright (C) 2014 Anthony King
Expand All @@ -17,12 +17,12 @@
# limitations under the License.
#

from __future__ import print_function
Copy link
Member

Choose a reason for hiding this comment

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

This can be left in, it's fine in py3.


import binascii
import os
import struct
import sys
import hashlib
import math

Copy link
Member

Choose a reason for hiding this comment

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

These imports are unused

# Proof of Concept
POC = False
Expand Down Expand Up @@ -55,7 +55,9 @@ def get_kernel_size(image_name):

def bumped(image_data):
d = binascii.hexlify(image_data[-1024:])
return d.endswith(lg_magic) or d.startswith(lg_magic)
print(type(d))
print(lg_magic.encode("ASCII"), type(lg_magic.encode("ASCII")))
Copy link
Member

Choose a reason for hiding this comment

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

Instead of this change, lg_magic can be changed to be a byte string on line 38 (b"41....").

It's other uses will accept it

return d.endswith(lg_magic.encode("ASCII")) or d.startswith(lg_magic.encode("ASCII"))


def pair_reverse(s):
Expand All @@ -78,7 +80,10 @@ def get_size_from_kernel(f_image, page_size, seek_size):
def pad_image(image_name):
page_size = get_page_size(image_name)
image_size = os.path.getsize(image_name)
num_pages = image_size / page_size
num_pages = int(image_size / page_size)
print("page_size", page_size, type(page_size))
print("image_size", image_size, type(image_size))
print("num_pages", num_pages, type(num_pages))

calculated_size = get_kernel_size(image_name)

Expand All @@ -98,9 +103,11 @@ def pad_image(image_name):
i = num_pages - 1
f_image.seek(0, 0)
while i >= 0:
print("page size", page_size, type(page_size))
Copy link
Member

Choose a reason for hiding this comment

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

This is likely going to be very noisy, so best to remove

print("i", i, type(i))
f_image.seek(page_size * i, 0)
data = f_image.read(page_size)
data = data.split('\x00')[0]
data = data.split(b'\x00')[0]
if not data:
f_image.truncate(page_size * i)
i -= 1
Expand Down