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.

diff --git a/src/testsuite/connect-ssl-cert1-test.e b/src/testsuite/connect-ssl-cert1-test.e
index 69f066ebaa20f586ece63039060e08e9e6c250cc..5eb998b323a026f36d7ae383ea684e68fb658a9e 100644 (file)
--- 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 cf71d048de0fe9f3e1ef02de1bf624c8075c7737..cc10a1ed984085bbb524246dd167ebd867641740 100644 (file)
--- 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