DKIM: signing with t but no x timestamp. Bug 2851

[exim.git] / test / confs / 2033

diff --git a/test/confs/2033 b/test/confs/2033
index 73dcde61e16f3ec67724a0d578474ac37ec032e9..44ebbc5949de488772f9976ec2368658f3974ee1 100644 (file)
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -35,9 +35,6 @@ tls_advertise_hosts = *
 tls_certificate = ${if eq {SERVER}{server}{CERT1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail}
 
-tls_verify_hosts = *
-tls_verify_certificates = ${if eq {SERVER}{server}{CERT2}fail}
-
 
 # ----- Routers -----
 
@@ -81,7 +78,7 @@ client_r:
 
 client_s:
   driver = accept
-  local_parts = users
+  local_parts = user_s
   retry_use_local_part
   transport = send_to_server_req_passname
 
@@ -100,10 +97,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
 
   tls_verify_certificates = CA2
 
@@ -112,10 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
 
   tls_verify_certificates = \
     ${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
@@ -125,10 +120,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
 
   tls_verify_certificates = CA2
   tls_try_verify_hosts = *
@@ -140,8 +134,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
 
   tls_verify_certificates = CA2
   tls_verify_hosts = *
@@ -153,8 +146,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *
@@ -167,8 +159,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *
@@ -181,8 +172,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
-  tls_certificate = CERT2
-  tls_privatekey = CERT2
+  hosts_try_fastopen = :
 
   tls_verify_certificates = CA1
   tls_verify_cert_hostnames = *