X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/6aa849d3880096db053d1871e33a79e43571ab18..b7e4352c99fe3dee2af93f06ef0ac74ee355d5ea:/test/scripts/5840-DANE-OpenSSL/5840

diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index 143bf615b..fdff36119 100644
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -2,11 +2,11 @@
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
-# TLSA (3 1 1)
+### TLSA (3 1 1)
 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****
-# TLSA (3 1 2)
+### TLSA (3 1 2)
 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****
@@ -14,17 +14,17 @@ exim -qf
 ****
 #
 #
-# Recipient callout
+### Recipient callout
 exim -DOPT=callout -bhc 127.0.0.1
 MAIL FROM: <CALLER@myhost.test.ex>
-RCPT TO: <CALLER@dane256ee.test.ex>
+RCPT TO: <rcptuser@dane256ee.test.ex>
 ****
 killdaemon
 #
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
-# TLSA (2 0 1)
+### TLSA (2 0 1)
 exim -odq CALLER@mxdane256ta.test.ex
 Testing
 ****
@@ -32,7 +32,7 @@ exim -qf
 ****
 killdaemon
 #
-# A server with a nonverifying cert and no TLSA
+### A server with a nonverifying cert and no TLSA
 # Check we get a non-CV but TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=no -bd -oX PORT_D
 ****
@@ -43,7 +43,7 @@ exim -qf
 ****
 killdaemon
 #
-# A server with a verifying cert and no TLSA
+### A server with a verifying cert and no TLSA
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****
@@ -57,18 +57,29 @@ killdaemon
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
-# A server with two MXs for which both TLSA lookups return defer
+### A server with two MXs for which both TLSA lookups return defer
 exim -odq CALLER@mxdanelazy.test.ex
 Testing
 ****
-# A server lacking a TLSA, required
+### A server lacking a TLSA, dane required (should fail)
 exim -odq CALLER@dane.no.1.test.ex
 Testing
 ****
-# A server lacking a TLSA, requested only
+### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC)
 exim -odq CALLER@dane.no.2.test.ex
 Testing
 ****
+### A server where the A is dnssec and the TLSA _fails_
+exim -odq CALLER@danebroken1.test.ex
+Testing
+****
+# ### A server securely saying "no TLSA records here", dane required (should fail)
+# exim -odq CALLER@dane.no.3.test.ex
+# Testing
+# ### A server securely saying "no TLSA records here", dane requested only (should transmit)
+# exim -odq CALLER@dane.no.4.test.ex
+# Testing
+# ****
 exim -qf
 ****
 killdaemon