diff --git a/pq-tls-benchmark-framework/emulation-exp/code/install-prereqs-ubuntu.sh b/pq-tls-benchmark-framework/emulation-exp/code/install-prereqs-ubuntu.sh index 11fac2bdd2572f2dbf80e7729d7fd2a911bdd211..e352c04916dc2f276ceeffe43727708c764d9d3f 100755 --- a/pq-tls-benchmark-framework/emulation-exp/code/install-prereqs-ubuntu.sh +++ b/pq-tls-benchmark-framework/emulation-exp/code/install-prereqs-ubuntu.sh @@ -13,7 +13,8 @@ sudo apt install -y git \ ninja-build \ libssl-dev \ libpcre3-dev \ - wget + wget \ + pkg-config NGINX_VERSION=1.26.1 CMAKE_VERSION=3.30 diff --git a/pq-tls-benchmark-framework/emulation-exp/code/kex/README.md b/pq-tls-benchmark-framework/emulation-exp/code/kex/README.md index 43d1272025ef5dd9bd9b99f8f6a36defeb7210b4..38fd7d39ac0eb8685fb71329ba53c7851ad69d9e 100644 --- a/pq-tls-benchmark-framework/emulation-exp/code/kex/README.md +++ b/pq-tls-benchmark-framework/emulation-exp/code/kex/README.md @@ -2,11 +2,18 @@ To run the kex experimant, you need to first have the necessary prerequisites installed. After that you can run the experiment and analyze the results. ## Install prerequisites +### Install cargo +```bash + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + # restart shell +``` + In `benchmarking-pqc-in-quic/pq-tls-benchmark-framework/emulation-exp/code`: ```bash - ./install_prereq-ubuntu.sh + ./install-prereq-ubuntu.sh ``` + ### Python venv Create a python virtual environment to install all necessary python packages in. In `benchmarking-pqc-in-quic/pq-tls-benchmark-framework/emulation-exp/code/kex`: diff --git a/pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/experiment.py b/pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/experiment.py index 913f137d2ef9ec0e072fc50431fe45c066a920bf..9babb98a596e868596a1e56c0597b4510f008921 100755 --- a/pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/experiment.py +++ b/pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/experiment.py @@ -76,8 +76,6 @@ def main(): for _, parameters in scenarios.iterrows(): # set network parameters of scenario set_network_parameters(parameters) - print(protocol) - continue for algorithm_class, algorithms in algorithms_to_bench_dict.items(): for kem_alg in algorithms: @@ -233,7 +231,7 @@ def time_handshake(protocol, kem_alg, measurements) -> list[float]: namespace_condition.notify() network_namespace = aquire_network_namespace() - # program = QUIC_S_TIMER if protocol == "quic" else S_TIMER + cc_algo = None match protocol: case "tlstcp":