Introduce a new argument in a2bits_list in order to specify the encoding of the string (unicode)

This commit is contained in:
Cédric Bonhomme 2017-05-04 13:05:56 +02:00
parent 49964d4f16
commit 5f5c07493c
No known key found for this signature in database
GPG key ID: A1CB94DE57B7A70D
6 changed files with 77 additions and 28 deletions

View file

@ -20,8 +20,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
__author__ = "Cedric Bonhomme"
__version__ = "$Revision: 0.2.2 $"
__version__ = "$Revision: 0.3 $"
__date__ = "$Date: 2016/08/04 $"
__revision__ = "$Date: 2017/05/04 $"
__license__ = "GPLv3"
import sys
@ -30,7 +31,10 @@ from PIL import Image
from stegano import tools
def hide(input_image_file: str, message, auto_convert_rgb: bool = False):
def hide(input_image_file: str,
message,
encoding='UTF-8',
auto_convert_rgb: bool = False):
"""Hide a message (string) in an image with the
LSB (Least Significant Bit) technique.
"""
@ -53,7 +57,7 @@ def hide(input_image_file: str, message, auto_convert_rgb: bool = False):
index = 0
message = str(message_length) + ":" + str(message)
message_bits = "".join(tools.a2bits_list(message))
message_bits = "".join(tools.a2bits_list(message, encoding))
message_bits += '0' * ((3 - (len(message_bits) % 3)) % 3)
npixels = width * height
@ -90,7 +94,7 @@ def hide(input_image_file: str, message, auto_convert_rgb: bool = False):
return encoded
def reveal(input_image_file):
def reveal(input_image_file, encoding='UTF-8'):
"""Find a message in an image (with the LSB technique).
"""
img = Image.open(input_image_file)
@ -106,9 +110,9 @@ def reveal(input_image_file):
if img.mode == 'RGBA':
pixel = pixel[:3] # ignore the alpha
for color in pixel:
buff += (color&1)<<(31-count)
buff += (color&1)<<(tools.ENCODINGS[encoding]-1 - count)
count += 1
if count == 32:
if count == tools.ENCODINGS[encoding]:
bitab.append(chr(buff))
buff, count = 0, 0
if bitab[-1] == ":" and limit == None: