Address jgh notes re OpenSSL

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

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index cbb9ce393dd0b266cb83af9e2e297ef07b576548..3904c50980619da587fa52aba019386237ffd9f3 100644 (file)
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -1,5 +1,11 @@
 # TLS server: general ops and certificate extractions
-exim -DSERVER=server -bd -oX PORT_D
+#
+# NOTE: current OpenSSL libraries return faulty my-cert information
+# when more than one is loaded, which the conf for this testcase does.
+# As a result the expansion done and logged is misleading.
+#
+# Make RSA authentication the only acceptable
+exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D
 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220
@@ -47,6 +53,7 @@ This is a test encrypted message.
 quit
 ??? 221
 ****
+# nonloop addr conn rejected lacking cert
 client-ssl HOSTIPV4 PORT_D
 ??? 220
 ehlo rhu.barb
@@ -57,7 +64,10 @@ ehlo rhu.barb
 ??? 250-
 ??? 250
 starttls
-??? 220
+??? 220 TLS go ahead
++++ 1
+help
+??? 554
 ****
 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
@@ -83,6 +93,36 @@ quit
 ??? 221
 ****
 killdaemon
+#
+# make ECDSA authentication preferred
+# DEFAULT:+RSA should work but does not seem to
+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