From 8d6f2c2820567a350c57dd15cee06e13535471c2 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 1 Apr 2024 20:54:42 +0200 Subject: [PATCH] Revert "testsuite: Pass -nameopt to openssl s_client." Although this is a nice looking solution, it is not that portable: for example, the "openssl s_client" command of LibreSSL 3.8.2 on OpenBSD 7.4 does not support it. So let's revert back to the "uglier" but working variant ... This reverts commit bdb55fb4b322b2c84530855a3b5148a0e387f5b4. --- src/testsuite/connect-ssl-cert1-test.e | 4 ++-- src/testsuite/connect-ssl-cert2-test.e | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/testsuite/connect-ssl-cert1-test.e b/src/testsuite/connect-ssl-cert1-test.e index 69f066eb..5eb998b3 100644 --- a/src/testsuite/connect-ssl-cert1-test.e +++ b/src/testsuite/connect-ssl-cert1-test.e @@ -1,10 +1,10 @@ # ngIRCd test suite # Server connect test -spawn openssl s_client -quiet -nameopt utf8,space_eq -connect 127.0.0.1:6790 +spawn openssl s_client -quiet -connect 127.0.0.1:6790 expect { timeout { exit 1 } - "*CN = my.first.domain.tld" + "*CN*=*my.first.domain.tld" } sleep 2 diff --git a/src/testsuite/connect-ssl-cert2-test.e b/src/testsuite/connect-ssl-cert2-test.e index cf71d048..cc10a1ed 100644 --- a/src/testsuite/connect-ssl-cert2-test.e +++ b/src/testsuite/connect-ssl-cert2-test.e @@ -1,10 +1,10 @@ # ngIRCd test suite # Server connect test -spawn openssl s_client -quiet -nameopt utf8,space_eq -connect 127.0.0.1:6790 +spawn openssl s_client -quiet -connect 127.0.0.1:6790 expect { timeout { exit 1 } - "*CN = my.second.domain.tld" + "*CN*=*my.second.domain.tld" } sleep 2 -- 2.39.2