Refactor AlphabetKet to SubstitutionKey

This commit is contained in:
2024-07-03 11:44:26 -05:00
parent 18991b3516
commit 8527caced0
8 changed files with 544 additions and 343 deletions

View File

@@ -1,13 +1,13 @@
from src.models import (
AlphabetKey, ClientKeys, MutualKeys, ClientPersistentDataKeys, ClientEphemeralDataKeys,
SubstitutionKey, ClientKeys, MutualKeys, ClientPersistentDataKeys, ClientEphemeralDataKeys,
MutualPersistentDataKeys, MutualEphemeralDataKeys, ClientPersistentMediumKeys, ClientEphemeralMediumKeys,
MutualPersistentMediumKeys, MutualEphemeralMediumKeys, DarcKey, OuterKey, Mask
)
def darc_phase2(
alphabet_phase1: AlphabetKey,
medium_phase1: AlphabetKey,
alphabet_phase1: SubstitutionKey,
medium_phase1: SubstitutionKey,
client_keys: ClientKeys,
mutual_keys: MutualKeys
):
@@ -29,7 +29,7 @@ def darc_phase2(
def receive_alphabet(
alphabet_phase1: AlphabetKey,
alphabet_phase1: SubstitutionKey,
client_persistent_data_keys: ClientPersistentDataKeys,
client_ephemeral_data_keys: ClientEphemeralDataKeys,
mutual_persistent_data_keys: MutualPersistentDataKeys,
@@ -57,7 +57,7 @@ def receive_alphabet(
def receive_medium(
medium_phase1: AlphabetKey,
medium_phase1: SubstitutionKey,
client_persistent_medium_keys: ClientPersistentMediumKeys,
client_ephemeral_medium_keys: ClientEphemeralMediumKeys,
mutual_persistent_medium_keys: MutualPersistentMediumKeys,
@@ -152,8 +152,8 @@ def transmit_medium(
def darc_phase3(
alphabet_phase2: AlphabetKey,
medium_phase2: AlphabetKey,
alphabet_phase2: SubstitutionKey,
medium_phase2: SubstitutionKey,
client_keys: ClientKeys,
mutual_keys: MutualKeys
):
@@ -175,8 +175,8 @@ def darc_phase3(
def merge_message(
alphabet_phase3: AlphabetKey,
medium_phase3: AlphabetKey,
alphabet_phase3: SubstitutionKey,
medium_phase3: SubstitutionKey,
client_keys: ClientKeys,
mutual_keys: MutualKeys,
message: list[int]