Change the default for hosts_try_dane, enabling use by default

[exim.git] / test / scripts / 5820-DANE-GnuTLS / 5820

diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
index 652661cc1849f9a88b00b295166e67ac6a3d5b16..4b5f9dd877e0158515b174a7233cd4359e674363 100644 (file)
--- a/test/scripts/5820-DANE-GnuTLS/5820
+++ b/test/scripts/5820-DANE-GnuTLS/5820
@@ -2,11 +2,11 @@
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****

-### TLSA (3 1 1)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)

 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****
 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****

-### TLSA (3 1 2)
+### TLSA (3 1 2) (            SHA2-512)

 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****
 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****


@@ -24,7 +24,7 @@ killdaemon
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****

-### TLSA (2 0 1)
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)

 exim -odf CALLER@mxdane256ta.test.ex
 Testing
 ****
 exim -odf CALLER@mxdane256ta.test.ex
 Testing
 ****


@@ -44,7 +44,7 @@ killdaemon
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****

-exim -odf CALLER@thishost.test.ex
+exim -odf -DDETAILS=ca CALLER@thishost.test.ex

 Testing
 ****
 exim -DOPT=no_certname -qf
 Testing
 ****
 exim -DOPT=no_certname -qf


@@ -103,7 +103,7 @@ Testing
 ****
 #
 ### A server with a mixed-usage set of TLSAs - the EE-mode one failing verify (should deliver, DANE-mode)
 ****
 #
 ### A server with a mixed-usage set of TLSAs - the EE-mode one failing verify (should deliver, DANE-mode)

-# that way round to excersize more code in the implementation
+# that way round to exercise more code in the implementation

 exim -odf CALLER@danemixed.test.ex
 Testing
 ****
 exim -odf CALLER@danemixed.test.ex
 Testing
 ****


@@ -123,6 +123,15 @@ Testing
 exim -odf CALLER@danebroken8.example.com
 Testing
 ****
 exim -odf CALLER@danebroken8.example.com
 Testing
 ****

+killdaemon

 #
 #

+#
+sudo rm DIR/spool/db/retry
+exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
+****
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)
+exim -odf -DCONTROL=: CALLER@danebroken2.test.ex
+****

 killdaemon
 killdaemon

+#

 no_msglog_check
 no_msglog_check