Fix CVE-2016-1531

[exim.git] / test / confs / 5608

diff --git a/test/confs/5608 b/test/confs/5608
index 272d5f638afaf70b444e956a6efc585f9ac53709..ed0a445557c7dbed2371dc702ba67cec46539ba8 100644 (file)
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -1,9 +1,10 @@
-# Exim test configuration 5601
-# OCSP stapling, client, tpda
+# Exim test configuration 5608
+# OCSP stapling, client, events
 
 SERVER =
 
 exim_path = EXIM_PATH
+keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 rfc1413_query_timeout = 0s
@@ -55,7 +56,7 @@ check_data:
   accept
 
 logger:
-  accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
+  accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
   warn logwrite = client ocsp status: $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
@@ -101,7 +102,7 @@ send_to_server1:
   hosts_require_tls =  *
   hosts_request_ocsp = :
   headers_add =                        X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_event_action =          ${acl {logger}}
+  event_action =               ${acl {logger}}
 
 # norequire: request stapling but do not verify
 send_to_server2:
@@ -113,7 +114,7 @@ send_to_server2:
   hosts_require_tls =  *
 # note no ocsp mention here
   headers_add =                        X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_event_action =          ${acl {logger}}
+  event_action =               ${acl {logger}}
 
 # (any other name): request and verify
 send_to_server3:
@@ -126,7 +127,7 @@ send_to_server3:
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add =                        X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_event_action =          ${acl {logger}}
+  event_action =               ${acl {logger}}
 
 # (any other name): request and verify, ssl-on-connect
 send_to_server4:
@@ -140,7 +141,7 @@ send_to_server4:
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add =                        X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_event_action =          ${acl {logger}}
+  event_action =               ${acl {logger}}
 
 
 # ----- Retry -----