diff options
| -rw-r--r-- | encrypt.py | 1 | ||||
| -rw-r--r-- | presentation/css/style.css | 10 |
2 files changed, 11 insertions, 0 deletions
@@ -110,6 +110,7 @@ def encrypt(text, passphrase): else: mixed_matrix = mix_columns(diffused_matrix) merged_matrix = xor_matrices(mixed_matrix, round_keys[r + 1]) + print(" ".join([int_to_hex_string(item) for sublist in merged_matrix for item in sublist])) flat_matrix = [int_to_hex_string(item) for sublist in merged_matrix for item in sublist] print(" ".join(flat_matrix)) diff --git a/presentation/css/style.css b/presentation/css/style.css index db9af40..cf0e33b 100644 --- a/presentation/css/style.css +++ b/presentation/css/style.css @@ -30,6 +30,7 @@ right: 35%; } +<<<<<<< HEAD .description { margin-top: 16px; } @@ -38,6 +39,8 @@ display: none; } +======= +>>>>>>> origin/master table, tbody, tr { border: 0; !important; @@ -47,4 +50,11 @@ td, th { text-align: center !important; border: 1px solid white !important; border-collapse: collapse; +<<<<<<< HEAD +======= +} + +.description { + margin-top: 16px; +>>>>>>> origin/master }
\ No newline at end of file |