From acade23e86adfc2e5777d7bde1734f63304b1545 Mon Sep 17 00:00:00 2001 From: Donovan Date: Wed, 3 Jul 2024 09:50:37 -0500 Subject: [PATCH] refactor var names --- src/client_darc.py | 29 ++++++++++------------------- src/server_darc.py | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/client_darc.py b/src/client_darc.py index 69e510b..7959ff6 100644 --- a/src/client_darc.py +++ b/src/client_darc.py @@ -93,7 +93,7 @@ def transmit_alphabet( mutual_persistent_data_keys: MutualPersistentDataKeys, mutual_ephemeral_data_keys: MutualEphemeralDataKeys ): - mdpi2 = mutual_persistent_data_keys.inner_key_2 + mpdi2 = mutual_persistent_data_keys.inner_key_2 mdi1 = mutual_persistent_data_keys.inner_key_1 << mutual_ephemeral_data_keys.inner_key_1 mdo1 = mutual_persistent_data_keys.outer_key_1 << mutual_ephemeral_data_keys.outer_key_1 mdo2 = mutual_persistent_data_keys.outer_key_2 << mutual_ephemeral_data_keys.outer_key_2 @@ -110,16 +110,10 @@ def transmit_alphabet( meda = mutual_ephemeral_data_keys.alpha_key alphabet_phase3 = ( - (alphabet_phase2 << ((~cdi1 << mdpi2) < (mdo3 << cdo1_cdo2))) ^ - ((((ceda ^ cpda ^ meda) < mdo1) << ((mdi1 < mdo2) << (mdpi2 < mdo3))) < cdo1_cdo2) - ) - - - alphabet_phase3 = ( - (alphabet_phase2 << ((~cdi1 << mdpi2) < (mdo3 << cdo1_cdo2))) ^ + (alphabet_phase2 << ((~cdi1 << mpdi2) < (mdo3 << cdo1_cdo2))) ^ ( ( - ((ceda ^ cpda ^ meda) < (mdo1 << cdo1_cdo2)) << ((mdi1 < (mdo2 << cdo1_cdo2)) << (mdpi2 < (mdo3 << cdo1_cdo2))) + ((ceda ^ cpda ^ meda) < (mdo1 << cdo1_cdo2)) << ((mdi1 < (mdo2 << cdo1_cdo2)) << (mpdi2 < (mdo3 << cdo1_cdo2))) ) ) ) @@ -133,7 +127,7 @@ def transmit_medium( mutual_persistent_medium_keys: MutualPersistentMediumKeys, mutual_ephemeral_medium_keys: MutualEphemeralMediumKeys ): - mmpi1 = mutual_persistent_medium_keys.inner_key_2 + mpmi2 = mutual_persistent_medium_keys.inner_key_2 mmi1 = mutual_persistent_medium_keys.inner_key_1 << mutual_ephemeral_medium_keys.inner_key_1 mmo1 = mutual_persistent_medium_keys.outer_key_1 << mutual_ephemeral_medium_keys.outer_key_1 mmo2 = mutual_persistent_medium_keys.outer_key_2 << mutual_ephemeral_medium_keys.outer_key_2 @@ -150,8 +144,8 @@ def transmit_medium( mema = mutual_ephemeral_medium_keys.alpha_key medium_phase3 = ( - ((medium_phase2 < ~cmo1_cmo2) << ((~cmi1 << mmpi1) < mmo3)) ^ - (((cpma ^ cema ^ mema) < mmo1) << ((mmi1 < mmo2) << (mmpi1 < mmo3))) + ((medium_phase2 < ~cmo1_cmo2) << ((~cmi1 << mpmi2) < mmo3)) ^ + (((cpma ^ cema ^ mema) < mmo1) << ((mmi1 < mmo2) << (mpmi2 < mmo3))) ) < cmo1_cmo2 return medium_phase3 @@ -185,19 +179,16 @@ def merge_message( medium_phase3: AlphabetKey, client_keys: ClientKeys, mutual_keys: MutualKeys, - input_sequence: list[int] + message: list[int] ): height = len(alphabet_phase3.matrix) width = len(alphabet_phase3.matrix[0]) - msg_len = len(input_sequence) + msg_len = len(message) eof_msg_mask = Mask.init_matrix(width, height, msg_len) - if msg_len < height: - padded_input_sequence = OuterKey.init_matrix(height) - padded_input_sequence.matrix = [input_sequence + padded_input_sequence.matrix[0][msg_len:]] - else: - padded_input_sequence = OuterKey(matrix=[input_sequence]) + padded_input_sequence = OuterKey.init_matrix(height) + padded_input_sequence.matrix = [message + padded_input_sequence.matrix[0][msg_len:]] cdo1 = client_keys.persistent.data.outer_key_1 << client_keys.ephemeral.data.outer_key_1 cdo2 = client_keys.persistent.data.outer_key_2 << client_keys.ephemeral.data.outer_key_2 diff --git a/src/server_darc.py b/src/server_darc.py index cfed4eb..482c4a5 100644 --- a/src/server_darc.py +++ b/src/server_darc.py @@ -40,12 +40,12 @@ def translate_data( spda = server_persistent_data_keys.alpha_key seda = server_ephemeral_data_keys.alpha_key - alpha_phase1 = ( + alphabet_phase1 = ( ((alphabet < sdo1) << (sdi1 < mdo3)) ^ (((spda ^ seda) < mdo1) << (mdi1 < mdo2)) ) - return alpha_phase1 + return alphabet_phase1 def translate_medium( @@ -61,8 +61,8 @@ def translate_medium( spma = server_persistent_medium_keys.alpha_key sema = server_ephemeral_medium_keys.alpha_key - operand = medium ^ (((spma ^ sema) < mmo1) << (mmi1 < mmo2)) - return operand + medium_phase1 = medium ^ (((spma ^ sema) < mmo1) << (mmi1 < mmo2)) + return medium_phase1 def darc_phase_4(alphabet: AlphabetKey, darc_message: AlphabetKey, server_keys: ServerKeys, mutual_keys: MutualKeys): @@ -105,11 +105,11 @@ def phase4_translate_alphabet( mpda = mutual_persistent_data_keys.alpha_key meda = mutual_ephemeral_data_keys.alpha_key - translated_alpha = ( + translated_alphabet = ( ((alphabet < sdo1) << ((sdi1 << mpdi2) < mdo3)) ^ (((spda ^ seda ^ mpda ^ meda) < mdo1) << ((mdi1 < mdo2) << (mpdi2 < mdo3))) ) - return translated_alpha + return translated_alphabet def phase4_unwrap_medium( @@ -137,16 +137,16 @@ def phase4_unwrap_medium( mpma = mutual_persistent_medium_keys.alpha_key mema = mutual_ephemeral_medium_keys.alpha_key - medium_unwrapped = ( + unwrapped_medium = ( ((darc_message < ~mmo4) << ~(mmi4 < (mmo5 << nmmo6_nmmo4))) ^ (((spma ^ sema ^ mpma ^ mema) < mmo1) << ((mmi1 < mmo2) << (mpmi2 < mmo3))) ) << (~mmi3 < nmmo6_nmmo4) - return medium_unwrapped + return unwrapped_medium -def resolve_message(translated_alphabet: AlphabetKey, translated_messasge: AlphabetKey) -> list[int]: +def resolve_message(translated_alphabet: AlphabetKey, unwrapped_medium: AlphabetKey) -> list[int]: alphabet_map = {str(key): idx for idx, key in enumerate(translated_alphabet.matrix)} - encoded_message = [str(alpha) for alpha in translated_messasge.matrix] + encoded_message = [str(alpha) for alpha in unwrapped_medium.matrix] message = [] for alpha in encoded_message: