Retry once a single-item delivery from the queue, when lock causes no attempt

[exim.git] / test / scripts / 2100-OpenSSL / 2102

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 2e7dca0a65e82976b512588b46a2aa194be4a606..ade51944c000cbedc0bc5f2dfa41310d0c05f979 100644 (file)
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -1,5 +1,15 @@
-# TLS server: general
-exim -DSERVER=server -bd -oX PORT_D
+# TLS server: general ops and certificate extractions
+#
+# 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 -DSERVER=server -DORDER=RSA -bd -oX PORT_D

 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220
 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220


@@ -47,6 +57,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

+# nonloop addr conn rejected lacking cert

 client-ssl HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
 client-ssl HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb


@@ -57,9 +68,12 @@ ehlo rhu.barb
 ??? 250-
 ??? 250
 starttls
 ??? 250-
 ??? 250
 starttls

-??? 220
+??? 220 TLS go ahead
++++ 1
+help
+??? 554

 ****
 ****

-client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/cert2 DIR/aux-fixed/cert2
+client-ssl HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -83,6 +97,38 @@ quit
 ??? 221
 ****
 killdaemon
 ??? 221
 ****
 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
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<CALLER@test.ex>
+??? 250
+rcpt to:<CALLER@test.ex>
+??? 250
+DATA
+??? 3
+This is a test encrypted message.
+It should be sent under the EC server cert and with an ECDSA cipher.
+.
+??? 250
+quit
+??? 221
+****
+killdaemon

 exim -qf
 ****
 exim -bh 10.0.0.1
 exim -qf
 ****
 exim -bh 10.0.0.1