Skip to content

Commit

Permalink
Reformat files with black
Browse files Browse the repository at this point in the history
  • Loading branch information
deajan committed Jul 8, 2022
1 parent d5cea6c commit 890c1e6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
16 changes: 10 additions & 6 deletions cryptidy/asymmetric_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ def verify_key(key, key_type):
)


def encrypt_message_hf(msg, key, header=b'', footer=b'', random_header_len=0, random_footer_len=0):
def encrypt_message_hf(
msg, key, header=b"", footer=b"", random_header_len=0, random_footer_len=0
):
# type: (Any, str, Union[str, bytes], Union[str, bytes], int, int) -> bytes
"""
Simple wrapper for encrypt_message that adds a given (or random) header and footer
Expand All @@ -106,11 +108,11 @@ def encrypt_message_hf(msg, key, header=b'', footer=b'', random_header_len=0, ra
When random bytes are requested, it serves to additional scramble data
"""
if header and isinstance(header, str):
header = header.encode('utf-8')
header = header.encode("utf-8")
if random_header_len > 0:
header += generate_random_string(random_header_len).encode("utf-8")
if footer and isinstance(footer, str):
footer = footer.encode('utf-8')
footer = footer.encode("utf-8")
if random_footer_len > 0:
footer += generate_random_string(random_footer_len).encode("utf-8")
return header + encrypt_message(msg, key) + footer
Expand Down Expand Up @@ -155,17 +157,19 @@ def rsa_encrypt_message(msg, public_key):
return enc_session_key + aes_encrypt_message(msg, session_key)


def decrypt_message_hf(msg, key, header=None, footer=None, random_header_len=0, random_footer_len=0):
def decrypt_message_hf(
msg, key, header=None, footer=None, random_header_len=0, random_footer_len=0
):
# type: (Union[bytes, str], str, Union[str, bytes], Union[str, bytes], int, int) -> Tuple[datetime, Any]
"""
Simple wrapper for decrypt_message that adds random header and footer chars
This function solely exists for compat reasons
"""
# Remove header and footer if set
if header:
msg = msg[len(header):]
msg = msg[len(header) :]
if footer:
msg = msg[:-len(footer)]
msg = msg[: -len(footer)]

if random_footer_len > 0:
return decrypt_message(msg[random_header_len:][:-random_footer_len], key)
Expand Down
16 changes: 10 additions & 6 deletions cryptidy/symmetric_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ def verify_key(aes_key):
raise TypeError("Wrong encryption key provided. Key type should be binary.")


def encrypt_message_hf(msg, key, header=b'', footer=b'', random_header_len=0, random_footer_len=0):
def encrypt_message_hf(
msg, key, header=b"", footer=b"", random_header_len=0, random_footer_len=0
):
# type: (Any, bytes, Union[str, bytes], Union[str, bytes], int, int) -> bytes
"""
Simple wrapper for encrypt_message that adds a given (or random) header and footer
Expand All @@ -111,11 +113,11 @@ def encrypt_message_hf(msg, key, header=b'', footer=b'', random_header_len=0, ra
When random bytes are requested, it serves to additional scramble data
"""
if header and isinstance(header, str):
header = header.encode('utf-8')
header = header.encode("utf-8")
if random_header_len > 0:
header += generate_random_string(random_header_len).encode("utf-8")
if footer and isinstance(footer, str):
footer = footer.encode('utf-8')
footer = footer.encode("utf-8")
if random_footer_len > 0:
footer += generate_random_string(random_footer_len).encode("utf-8")
enc_msg = encrypt_message(msg, key)
Expand Down Expand Up @@ -161,17 +163,19 @@ def aes_encrypt_message(msg, aes_key):
raise ValueError("Cannot AES encrypt data: %s." % exc)


def decrypt_message_hf(msg, key, header=None, footer=None, random_header_len=0, random_footer_len=0):
def decrypt_message_hf(
msg, key, header=None, footer=None, random_header_len=0, random_footer_len=0
):
# type: (Union[bytes, str], bytes, Union[str, bytes], Union[str, bytes], int, int) -> Tuple[datetime, Any]
"""
Simple wrapper for decrypt_message that adds random header and footer chars
This function solely exists for compat reasons
"""
# Remove header and footer if set
if header:
msg = msg[len(header):]
msg = msg[len(header) :]
if footer:
msg = msg[:-len(footer)]
msg = msg[: -len(footer)]

if random_footer_len > 0:
return decrypt_message(msg[random_header_len:][:-random_footer_len], key)
Expand Down

0 comments on commit 890c1e6

Please sign in to comment.