X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ce889807c90746896f1310e9f4957215f46f7836..d3a0dde57754d2b434957c126e1a22e2094cbbf1:/test/stderr/5840?ds=inline diff --git a/test/stderr/5840 b/test/stderr/5840 index 5ccf7cda0..e4da8d083 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -38,9 +38,6 @@ >>> 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) >>> SMTP>> EHLO myhost.test.ex >>> cmd buf flush 21 bytes >>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] @@ -50,9 +47,9 @@ >>> 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:<> SIZE=ssss +>>> SMTP>> MAIL FROM:<> >>> SMTP>> RCPT TO: ->>> cmd buf flush 62 bytes +>>> cmd buf flush 52 bytes >>> SMTP<< 250 OK >>> SMTP<< 250 Accepted >>> SMTP>> QUIT @@ -65,27 +62,43 @@ >>> ----------- 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] +LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs ### TLSA (2 0 1) +### TLSA (2 1 1) ### A server with a nonverifying cert and no TLSA ### A server with a verifying cert and no TLSA -### A server with two MXs for which both TLSA lookups return defer +### A server with two MXs for which both TLSA lookups return defer (delivery should defer) ### A server lacking a TLSA, dane required (should fail) -### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC) -### A server where the A is dnssec and the TLSA _fails_ -### A server securely saying "no TLSA records here", dane required (should fail) -### A server securely saying "no TLSA records here", dane requested only (should transmit) +### A server lacking a TLSA, dane requested only (should deliver, non-DANE, as the NXDOMAIN is not DNSSEC) +### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer) +### A server securely saying "no TLSA records here", dane required (delivery should fail) +### A server securely saying "no TLSA records here", dane requested only (should deliver) +### A server securely serving a wrong TLSA record, dane requested only (delivery should fail) +### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE) +### A server insecurely serving a good TLSA record, dane required (delivery should fail) +### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE) +### 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 ******** SERVER ******** ### TLSA (3 1 1) ### TLSA (3 1 2) ### Recipient callout ### TLSA (2 0 1) +### TLSA (2 1 1) ### A server with a nonverifying cert and no TLSA ### A server with a verifying cert and no TLSA -### A server with two MXs for which both TLSA lookups return defer +### A server with two MXs for which both TLSA lookups return defer (delivery should defer) ### A server lacking a TLSA, dane required (should fail) -### A server lacking a TLSA, dane requested only (should fail, as the NXDOMAIN is not DNSSEC) -### A server where the A is dnssec and the TLSA _fails_ -### A server securely saying "no TLSA records here", dane required (should fail) -### A server securely saying "no TLSA records here", dane requested only (should transmit) +### A server lacking a TLSA, dane requested only (should deliver, non-DANE, as the NXDOMAIN is not DNSSEC) +### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer) +### A server securely saying "no TLSA records here", dane required (delivery should fail) +### A server securely saying "no TLSA records here", dane requested only (should deliver) +### A server securely serving a wrong TLSA record, dane requested only (delivery should fail) +### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE) +### A server insecurely serving a good TLSA record, dane required (delivery should fail) +### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE) +### 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