testing: Use Debian bookworm to test TKM

diff --git a/testing/tkm/Dockerfile b/testing/tkm/Dockerfile
index f4e8d5071f2ab3f27bd9d9e1c09a4a1a5abdccdf..04a0efd9093545b961e6267609fc4124a923656c 100644 (file)
--- a/testing/tkm/Dockerfile
+++ b/testing/tkm/Dockerfile
@@ -23,12 +23,12 @@
 #
 #   make -j check TESTS_RUNNERS=tkm TESTS_TKM=1
 
-FROM debian:bullseye
+FROM debian:bookworm
 
 ARG packages="autoconf automake bison build-essential ca-certificates ccache \
 flex gettext git gperf libssl-dev libtool pkg-config \
-gnat gprbuild libahven9-dev libxmlada-schema10-dev libgmpada10-dev \
-libalog6-dev"
+gnat gprbuild libahven11-dev libxmlada-schema12-dev libgmpada12-dev \
+libalog8-dev"
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -qq -y \

diff --git a/testing/tkm/generate-config.sh b/testing/tkm/generate-config.sh
index 1c12f840de05efbbfc5c4141a835c9b678a2bda2..9bd5d45074689a04494239c298632de841113a6d 100755 (executable)
--- a/testing/tkm/generate-config.sh
+++ b/testing/tkm/generate-config.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 openssl genrsa -out key.pem 2048
-openssl rsa -in key.pem -outform der -out key.der
+openssl rsa -in key.pem -outform der -out key.der -traditional
 
 openssl req -x509 -nodes -newkey rsa:4096 -keyout cakey.pem -outform der \
        -out ca.der -sha256 -subj "/CN=CA" -addext basicConstraints=critical,CA:TRUE