diff --git a/src/mimick_csharp_test.py b/src/mimick_csharp_test.py index e129524..62cdc2c 100644 --- a/src/mimick_csharp_test.py +++ b/src/mimick_csharp_test.py @@ -198,8 +198,6 @@ def transceive_medium(medium_phase1: DarcKey, client_persistent_keys: ClientPers mo1 = mutual_persistent_keys.outer_key_1 << mutual_ephemeral_keys.outer_key_1 mo2 = mutual_persistent_keys.outer_key_2 << mutual_ephemeral_keys.outer_key_2 mo3 = mutual_persistent_keys.outer_key_3 << mutual_ephemeral_keys.outer_key_3 - co1 = client_persistent_keys.outer_key_1 << client_ephemeral_keys.outer_key_1 - co2 = client_persistent_keys.outer_key_2 << client_ephemeral_keys.outer_key_2 mi1_mo2 = mi1 < mo2 @@ -210,7 +208,7 @@ def transceive_medium(medium_phase1: DarcKey, client_persistent_keys: ClientPers mpi1_mo3 = mutual_persistent_keys.inner_key_2 < mo3 - medium_phase3 = (result << mpi1_mo3) < (co1 << co2) + medium_phase3 = (result << mpi1_mo3) return medium_phase3 @@ -226,15 +224,9 @@ def merge_message(alphabet: DarcKey, medium: DarcKey, client_keys: ClientKeys, m input_seq = padded_input_sequence - cmo1 = client_keys.persistent.medium.outer_key_1 << client_keys.ephemeral.medium.outer_key_1 - cmo2 = client_keys.persistent.medium.outer_key_2 << client_keys.ephemeral.medium.outer_key_2 - - cmo1_cmo2 = cmo1 << cmo2 a_i = alphabet < input_seq - ncmo2_ncmo1 = ~cmo1_cmo2 - if msg_len < height: a_i.matrix[msg_len] = eof_arr @@ -248,16 +240,15 @@ def merge_message(alphabet: DarcKey, medium: DarcKey, client_keys: ClientKeys, m mmi3_nmmo6_nmmo4_co1_co2 = (mmi3 < nmmo6_nmmo4_co1_co2) - message = medium ^ ((a_i << mmi3_nmmo6_nmmo4_co1_co2) < cmo1_cmo2 ) + message = (medium ) ^ ((a_i << mmi3_nmmo6_nmmo4_co1_co2)) mmo5 = mutual_keys.persistent.medium.outer_key_5 << mutual_keys.ephemeral.medium.outer_key_5 mpmi4_memi2 = mutual_keys.persistent.medium.inner_key_4 << mutual_keys.ephemeral.medium.inner_key_2 - mutual_outer_key_4 = ncmo2_ncmo1 << mmo4 - outer_key_2 = mmo5 << nmmo6_nmmo4 << cmo1_cmo2 + mmo5_nmmo6_nmmo4 = mmo5 << nmmo6_nmmo4 - message = message << (mpmi4_memi2 < outer_key_2) - message = message < mutual_outer_key_4 + message = message << ((mpmi4_memi2 < mmo5_nmmo6_nmmo4)) + message = (message ) < mmo4 return message