From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 13 Jul 2023 08:47:51 +0000 (+0200)
Subject: testing: Use Debian bookworm to test TKM
X-Git-Tag: android-2.4.2~22^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043e10ebb87a2b9782c8b50bc23fff53e5aefbeb;p=thirdparty%2Fstrongswan.git

testing: Use Debian bookworm to test TKM
---

diff --git a/testing/tkm/Dockerfile b/testing/tkm/Dockerfile
index f4e8d5071f..04a0efd909 100644
--- 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 1c12f840de..9bd5d45074 100755
--- 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