Skip to content

Commit c596016

Browse files
pre-commit-ci[bot]ignacio-gn
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 2962391 commit c596016

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

ciphers/rsa_cipher.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,9 @@ def encrypt_and_write_to_file(
7878
sys.exit(
7979
"ERROR: Block size is {} bits and key size is {} bits. The RSA cipher "
8080
"requires the block size to be equal to or greater than the key size. "
81-
<<<<<<< HEAD
8281
"Either decrease the block size or use different keys.".format(
8382
block_size * 8, key_size
8483
)
85-
=======
86-
"Either decrease the block size or use different keys."
87-
.format(block_size * 8, key_size)
88-
>>>>>>> d91fc28 (Update rsa_cipher.py)
8984
)
9085

9186
encrypted_blocks = [str(i) for i in encrypt_message(message, (n, e), block_size)]

0 commit comments

Comments
 (0)