X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/176cf342af83cab469cb3bbd24221c88c8e00bf6..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/scripts/2100-OpenSSL/2102

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 374f3a27f..baebe5eb1 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -1,11 +1,15 @@
 # TLS server: general ops and certificate extractions
 #
-# NOTE: current OpenSSL libraries return faulty my-cert information
-# when more than one is loaded, which the conf for this testcase does.
+# NOTE: OpenSSL libraries return faulty my-cert information prior to OpenSSL 1.1.1
+# when more than one cert is loaded, which the conf for this testcase does.
 # As a result the expansion done and logged is misleading.
+# While the golden log output is set to the misleading result, the testcase
+# would unfortunately fail on the fixed OpenSSL versions.  This has been bodged
+# by the addition of log/2102.openssl_1_1_1 and some detection coding in
+# runtest to force a "flavour".  This is fragile and bound to break in the future.
 #
 # Make RSA authentication the only acceptable
-exim -d-all+tls -DSERVER=server -DORDER=RSA -bd -oX PORT_D
+exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D
 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220
@@ -15,10 +19,18 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
-mail from:<CALLER@test.ex>
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<a@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
@@ -38,9 +50,17 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
@@ -62,6 +82,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220 TLS go ahead
@@ -77,10 +98,18 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
-mail from:<CALLER@test.ex>
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<b@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
@@ -96,6 +125,8 @@ killdaemon
 #
 # make ECDSA authentication preferred
 # DEFAULT:+RSA should work but does not seem to
+# also, will fail under TLS1.3 because there is no choice of auth
+# - so we disable that in the conf
 exim -DSERVER=server -DORDER=ECDSA:RSA:!COMPLEMENTOFDEFAULT -bd -oX PORT_D
 ****
 client-ssl 127.0.0.1 PORT_D
@@ -106,10 +137,18 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 starttls
 ??? 220
-mail from:<CALLER@test.ex>
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<c@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250