From 53a296f8b629e002b13f328c74ff905963f75dc4 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 6 Mar 2024 14:36:38 +0100
Subject: tests/*/t: Replace filetype=sh with filetype=bash.

---
 tests/tls-sni/t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/tls-sni/t')

diff --git a/tests/tls-sni/t b/tests/tls-sni/t
index f18b8b0..6f3af1f 100644
--- a/tests/tls-sni/t
+++ b/tests/tls-sni/t
@@ -63,4 +63,4 @@ echo "SSL_CAfile = $HOME/.dovecot/conf.d/ca.crt" >>"$XDG_CONFIG_HOME/interimap/c
 interimap --debug || error
 sni_ok
 
-# vim: set filetype=sh :
+# vim: set filetype=bash :
-- 
cgit v1.2.3


From a4accc44ac1fddffba31d9bf52b76738a3562057 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 6 Mar 2024 14:52:56 +0100
Subject: tests/*/t: Explicitly pass `-in /dev/stdin` to openssl(1).

---
 tests/tls-sni/t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/tls-sni/t')

diff --git a/tests/tls-sni/t b/tests/tls-sni/t
index 6f3af1f..0565e49 100644
--- a/tests/tls-sni/t
+++ b/tests/tls-sni/t
@@ -1,9 +1,9 @@
 SERVERNAME="imap.example.net" # cf local_name{} section in the dovecot config
 X509_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -hx ssl_cert \
-    | openssl x509 -noout -fingerprint -sha256 \
+    | openssl x509 -in /dev/stdin -noout -fingerprint -sha256 \
     | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")"
 X509_2_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -f lname="$SERVERNAME" -hx ssl_cert \
-    | openssl x509 -noout -fingerprint -sha256 \
+    | openssl x509 -in /dev/stdin -noout -fingerprint -sha256 \
     | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")"
 
 # check that empty SSL_hostname disables SNI
-- 
cgit v1.2.3


From 66aeda7f653cfb72731fe7ff2925d7291158500f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@debian.org>
Date: Fri, 25 Apr 2025 17:59:57 +0200
Subject: Port tests and documentation to Dovecot 2.4.

See https://doc.dovecot.org/main/installation/upgrade/2.3-to-2.4.html .
---
 tests/tls-sni/t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/tls-sni/t')

diff --git a/tests/tls-sni/t b/tests/tls-sni/t
index 0565e49..7692f74 100644
--- a/tests/tls-sni/t
+++ b/tests/tls-sni/t
@@ -1,9 +1,9 @@
 SERVERNAME="imap.example.net" # cf local_name{} section in the dovecot config
-X509_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -hx ssl_cert \
-    | openssl x509 -in /dev/stdin -noout -fingerprint -sha256 \
+ssl_server_cert_file="$(doveconf -c "$HOME_remote/.dovecot/config" -hx ssl_server/cert_file)"
+X509_SHA256="$(openssl x509 -in "$ssl_server_cert_file" -noout -fingerprint -sha256 \
     | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")"
-X509_2_SHA256="$(doveconf -c "$HOME_remote/.dovecot/config" -f lname="$SERVERNAME" -hx ssl_cert \
-    | openssl x509 -in /dev/stdin -noout -fingerprint -sha256 \
+ssl_server_cert_file2="$(doveconf -c "$HOME_remote/.dovecot/config" -f local_name="$SERVERNAME" -hx ssl_server/cert_file)"
+X509_2_SHA256="$(openssl x509 -in "$ssl_server_cert_file2" -noout -fingerprint -sha256 \
     | sed -rn "/^.*=\\s*/ {s///p;q}" | tr -d : | tr "[A-Z]" "[a-z]")"
 
 # check that empty SSL_hostname disables SNI
-- 
cgit v1.2.3