voussoir/else
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use bytes instead of bits

Browse source
This commit is contained in:
unknown 2015-10-06 21:45:38 -07:00
parent dd4bacf3ab
commit f924170032
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Steganographic/examples/trespassing (thats_advertising_mp4).png
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d4ce1789cfb3ed83ff177fde898526318666dbfb77b95f70b8038d4367c45dca oid sha256:0a9c758425f9185dd207183b283f639cd6499d042ad75b51e3f7407624aeb8aa
size 6002883 size 6002882

19
Steganographic/steganographic.py
View file

@ -125,8 +125,8 @@ def encode(imagefilename, secretfilename):
raise StegError('The Secret can\'t be 0 bytes.') raise StegError('The Secret can\'t be 0 bytes.')
secret_extension = os.path.splitext(secretfilename)[1][1:] secret_extension = os.path.splitext(secretfilename)[1][1:]
secret_content_length = (len(secret) * 8) + (len(secret_extension) * 8) + 8 secret_content_length = (len(secret)) + (len(secret_extension)) + 1
requiredpixels = math.ceil((secret_content_length + 32) / 3) requiredpixels = math.ceil(((secret_content_length * 8) + 32) / 3)
if totalpixels < requiredpixels: if totalpixels < requiredpixels:
raise StegError('Image does not have enough pixels to store the Secret' raise StegError('Image does not have enough pixels to store the Secret'
'Must have at least %d pixels' % requiredpixels) 'Must have at least %d pixels' % requiredpixels)
@ -137,7 +137,7 @@ def encode(imagefilename, secretfilename):
pixel = list(image.getpixel((0, 0))) pixel = list(image.getpixel((0, 0)))
# Write secret length # Write secret length
secret_content_length_b = bin(secret_content_length)[2:].rjust(32, '0') secret_content_length_b = binary(secret_content_length).rjust(32, '0')
for x in range(32): for x in range(32):
modify_pixel(secret_content_length_b[x]) modify_pixel(secret_content_length_b[x])
increment_pixel() increment_pixel()
@ -209,7 +209,7 @@ def decode(imagefilename):
pixel_index += 1 pixel_index += 1
content_length = content_length[:-1] content_length = content_length[:-1]
content_length = int(content_length, 2) content_length = int(content_length, 2)
print('Content bits:', content_length) print('Content bytes:', content_length)
# Continue from the end of the header # Continue from the end of the header
# This would have been automatic if I used `increment_pixel` # This would have been automatic if I used `increment_pixel`
@ -231,8 +231,8 @@ def decode(imagefilename):
print('Extension:', extension) print('Extension:', extension)
# Remove the extension length # Remove the extension length
content_length -= 8 content_length -= 1
content_length -= 8 * len(extension) content_length -= len(extension)
# Prepare writes # Prepare writes
newname = os.path.splitext(imagefilename)[0] newname = os.path.splitext(imagefilename)[0]
@ -242,10 +242,9 @@ def decode(imagefilename):
outfile = open(newname, 'wb') outfile = open(newname, 'wb')
# extract data # extract data
content_bytes = content_length // 8 for byte in range(content_length):
for byte in range(content_bytes):
if byte % 1024 == 0: if byte % 1024 == 0:
percentage = (byte + 1) / content_bytes percentage = (byte + 1) / content_length
percentage = '%07.3f%%\r' % (100 * percentage) percentage = '%07.3f%%\r' % (100 * percentage)
print(percentage, end='') print(percentage, end='')
@ -254,7 +253,7 @@ def decode(imagefilename):
channel = pixel[channel_index] channel = pixel[channel_index]
channel = binary(channel)[-1] channel = binary(channel)[-1]
activebyte += channel activebyte += channel
if not (byte == content_bytes - 1 and bit == 7): if not (byte == content_length - 1 and bit == 7):
# If your Image dimensions are at the extreme limit of the Secret size, # If your Image dimensions are at the extreme limit of the Secret size,
# this would otherwise raise IndexError as it tries to grab the next pixel # this would otherwise raise IndexError as it tries to grab the next pixel
# off the canvas. # off the canvas.