Testsuite: case for TLS client tls-on-connect

[users/heiko/exim.git] / test / stderr / 5410

diff --git a/test/stderr/5410 b/test/stderr/5410
index 9953eee7cd2f31e396d237708388f899e4a8f940..03876629ee05187ffee535d76df4ec65c52a3cb7 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys

 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)


@@ -109,7 +110,7 @@ cmd buf flush ddd bytes
 cmd buf flush ddd bytes
   SMTP<< 220 TLS go ahead
 127.0.0.1 in tls_verify_hosts? no (option unset)
 cmd buf flush ddd bytes
   SMTP<< 220 TLS go ahead
 127.0.0.1 in tls_verify_hosts? no (option unset)

-127.0.0.1 in tls_try_verify_hosts? no (end of list)
+127.0.0.1 in tls_try_verify_hosts? yes (matched "*")

   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]


@@ -130,7 +131,7 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------

-processing "accept" (TESTSUITE/test-config 56)
+processing "accept" (TESTSUITE/test-config 57)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -219,18 +220,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()

-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       

   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true


@@ -282,8 +271,9 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 Exim version x.yz ....

+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys

 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)


@@ -383,7 +373,7 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------

-processing "accept" (TESTSUITE/test-config 56)
+processing "accept" (TESTSUITE/test-config 57)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -472,18 +462,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()

-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       

   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true


@@ -535,8 +513,9 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 Exim version x.yz ....

+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys

 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)


@@ -636,7 +615,7 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------

-processing "accept" (TESTSUITE/test-config 56)
+processing "accept" (TESTSUITE/test-config 57)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA


@@ -725,18 +704,6 @@ end of inline ACL: ACCEPT
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
        for $received_for}}
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()

-  ╰───skipping: result is not used
- ├──condition: def:tls_in_cipher_std
- ├─────result: false
-  ╭───scanning:  tls $tls_in_cipher_std
-       }}(Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       

   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true


@@ -788,6 +755,6 @@ LOG: MAIN
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
   Completed
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT

->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 
 ******** SERVER ********