X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/83da1223921fe30362e8374951360dcc8f21c4e7..bec360ab3e1060187724480d109884e56f912b0a:/test/scripts/2000-GnuTLS/2011?ds=sidebyside

diff --git a/test/scripts/2000-GnuTLS/2011 b/test/scripts/2000-GnuTLS/2011
index 6f72fba80..c5504c341 100644
--- a/test/scripts/2000-GnuTLS/2011
+++ b/test/scripts/2000-GnuTLS/2011
@@ -1,39 +1,20 @@
-# TLS client & server: (gnu)tls_require_xxx
-gnutls
-# Start up the server
+# Cached CA bundle re-use
+#
+# Preload a message into spool
+exim -odq fred@test.net
+Subject: test
+
+this is a test
+
+****
+#
+# Server to work against
 exim -DSERVER=server -bd -oX PORT_D
 ****
-# This puts a message on the queue (queue_only is set).
-exim userx@test.ex
-Testing
-****
-# This will fail to deliver encrypted because there are no acceptable 
-# ciphers, so it will deliver in clear.
-exim -qf -DCREQCIP=tls_require_ciphers=IDEA-CBC-MD5
-****
-# This delivers the message to the server, where it will remain
-# on the queue because queue_only is set.
-exim -qf -DCREQCIP=tls_require_ciphers=IDEA-CBC-MD5:DES-CBC3-SHA:RSA_ARCFOUR_SHA
-****
-# So we can deliver it again and again, with different parameters.
-exim -qf -DCREQMAC=gnutls_require_mac=MD5
-****
-exim -qf -DCREQMAC=gnutls_require_mac=!SHA1
-****
-exim -qf -DCREQMAC=gnutls_require_mac=MD5:SHA
-****
-exim -qf -DCREQMAC=gnutls_require_kx=!DHE
-****
-exim -qf -DCREQMAC=gnutls_require_protocols=SSL3
-****
-# Restart the server with a cipher restriction
-killdaemon
-exim -DSERVER=server \
-     -DSREQCIP=tls_require_ciphers=ARCFOUR \
-     -DSREQMAC=gnutls_require_mac=MD5 \
-     -bd -oX PORT_D
-****
-exim -qf
+#
+# Send message from spool
+exim -q
 ****
+#
 killdaemon
 no_msglog_check