X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/28646fa9c74b94722eadd7bc2d9c285245aded80..36bee217cba7c61313cce8e4a4a0c477db421dd0:/test/stderr/5840?ds=sidebyside

diff --git a/test/stderr/5840 b/test/stderr/5840
index 629277126..8da93ab49 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -1,5 +1,5 @@
-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)
 ### Recipient callout
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -9,26 +9,41 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> processing "accept"
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
+>>> processing "accept" (TESTSUITE/test-config 88)
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> calling client router
->>> dane256ee.test.ex in "*"? yes (matched "*")
+>>>  check dnssec require list
+>>>   dane256ee.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   dane256ee.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    dane256ee.test.ex in dnssec_request_domains? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by client router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for dane256ee.test.ex
 >>> callout cache: no address record found for rcptuser@dane256ee.test.ex
->>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4")
->>> interface=NULL port=1225
->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected
+>>> ip4.ip4.ip4.ip4 in hosts_require_dane?
+>>>  list element: ip4.ip4.ip4.ip4
+>>>  ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4")
+>>> interface=NULL port=PORT_D
+>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ...
+>>>  ip4.ip4.ip4.ip4 in hosts_try_fastopen?
+>>>   list element: 
+>>> connected
 >>>   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
+>>>          250-LIMITS MAILMAX=1000 RCPTMAX=50000
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          250-STARTTLS
@@ -38,19 +53,18 @@
 >>>   SMTP>> STARTTLS
 >>> cmd buf flush 10 bytes
 >>>   SMTP<< 220 TLS go ahead
->>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
->>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset)
->>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list)
+>>> ip4.ip4.ip4.ip4 in hosts_request_ocsp?
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
 >>>          250-SIZE 52428800
+>>>          250-LIMITS MAILMAX=1000 RCPTMAX=50000
 >>>          250-8BITMIME
 >>>          250-PIPELINING
 >>>          250 HELP
 >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset)
 >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset)
->>>   SMTP>> MAIL FROM:<>
+>>>   SMTP|> MAIL FROM:<>
 >>>   SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex>
 >>> cmd buf flush 52 bytes
 >>>   SMTP<< 250 OK
@@ -59,14 +73,15 @@
 >>> cmd buf flush 6 bytes
 >>>   SMTP<< 221 myhost.test.ex closing connection
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:221'
 >>> wrote callout cache domain record for dane256ee.test.ex:
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
-### TLSA (2 0 1)
+LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
@@ -83,12 +98,13 @@ LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server with a name not matching the cert.  TA-mode; should fail
 ### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)
 
 ******** SERVER ********
-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)
 ### Recipient callout
-### TLSA (2 0 1)
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
@@ -105,3 +121,4 @@ LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server with a name not matching the cert.  TA-mode; should fail
 ### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)