From c97aaa11672a8be3c15e6d022337764c6b03fb5b Mon Sep 17 00:00:00 2001
From: Bebbo <bartolomeo.mueller@stud.h-da.de>
Date: Tue, 31 Dec 2024 02:40:04 +0100
Subject: [PATCH] Fixes
---
.../emulation-exp/code/install-prereqs-ubuntu.sh | 3 ++-
.../emulation-exp/code/kex/README.md | 9 ++++++++-
.../emulation-exp/code/kex/scripts/experiment.py | 4 +---
3 files changed, 11 insertions(+), 5 deletions(-)
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 11fac2bdd..e352c0491 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 43d127202..38fd7d39a 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 913f137d2..9babb98a5 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":
--
GitLab