From a5fd31a5d6cf36578271061e68a1d85123c9ad1a Mon Sep 17 00:00:00 2001
From: Pol Henarejos <pol.henarejos@cttc.es>
Date: Fri, 29 Aug 2025 01:32:22 +0200
Subject: [PATCH] Upgrade to bookworm CI for fido2

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
---
 tests/docker/bookworm/Dockerfile | 32 ++++++++++++++++++++++++++++++++
 tests/docker_env.sh              |  2 +-
 tests/start-up-and-test.sh       |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 tests/docker/bookworm/Dockerfile

diff --git a/tests/docker/bookworm/Dockerfile b/tests/docker/bookworm/Dockerfile
new file mode 100644
index 0000000..db2074a
--- /dev/null
+++ b/tests/docker/bookworm/Dockerfile
@@ -0,0 +1,32 @@
+FROM debian:bookworm
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt upgrade -y
+RUN apt install -y apt-utils
+RUN apt install -y libccid \
+    libpcsclite-dev \
+    git \
+    autoconf \
+    pkg-config \
+    libtool \
+    help2man \
+    automake \
+    gcc \
+    make \
+    build-essential \
+    opensc \
+    python3 \
+    python3-pip \
+    swig \
+    cmake \
+    libfuse-dev \
+    && rm -rf /var/lib/apt/lists/*
+RUN pip3 install pytest pycvc cryptography pyscard inputimeout fido2==2.0.0 --break-system-packages
+WORKDIR /
+RUN git clone https://github.com/frankmorgner/vsmartcard.git
+WORKDIR /vsmartcard/virtualsmartcard
+RUN autoreconf --verbose --install
+RUN ./configure --sysconfdir=/etc
+RUN make && make install
+WORKDIR /
diff --git a/tests/docker_env.sh b/tests/docker_env.sh
index 384bc9c..7c8cebe 100644
--- a/tests/docker_env.sh
+++ b/tests/docker_env.sh
@@ -46,7 +46,7 @@
 
 
 # default values, can be overridden by the environment
-: ${MBEDTLS_DOCKER_GUEST:=bullseye}
+: ${MBEDTLS_DOCKER_GUEST:=bookworm}
 
 
 DOCKER_IMAGE_TAG="pico-hsm-test:${MBEDTLS_DOCKER_GUEST}"
diff --git a/tests/start-up-and-test.sh b/tests/start-up-and-test.sh
index 1620c97..613b594 100755
--- a/tests/start-up-and-test.sh
+++ b/tests/start-up-and-test.sh
@@ -3,6 +3,6 @@
 /usr/sbin/pcscd &
 sleep 2
 rm -f memory.flash
-cp -R tests/docker/fido2/* /usr/local/lib/python3.9/dist-packages/fido2/hid
+cp -R tests/docker/fido2/* /usr/local/lib/python3.11/dist-packages/fido2/hid
 ./build_in_docker/pico_fido > /dev/null &
 pytest tests