Fix cyrus-sasl authenticator for $authenticated_fail_id. Bug 2338

[exim.git] / test / confs / 5841

diff --git a/test/confs/5841 b/test/confs/5841
index 57d692826af3dd3181075029e3c0adb69346b026..98de91d76033bce6d8065bcff159fad22e8d6b43 100644 (file)
--- a/test/confs/5841
+++ b/test/confs/5841
@@ -2,7 +2,7 @@
 # DANE/OpenSSL - ciphers option
 
 SERVER=
 # DANE/OpenSSL - ciphers option
 
 SERVER=

-OPT=
+LIST=

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -25,6 +25,12 @@ tls_privatekey =  ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.k
 # Permit two specific ciphers
 tls_require_ciphers = ECDHE-RSA-CAMELLIA256-SHA384:ECDHE-RSA-AES256-GCM-SHA384
 
 # Permit two specific ciphers
 tls_require_ciphers = ECDHE-RSA-CAMELLIA256-SHA384:ECDHE-RSA-AES256-GCM-SHA384
 

+# Force TLS1.2 so that the ciphers choice works
+
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
+

 # ----- Routers -----
 begin routers
 
 # ----- Routers -----
 begin routers
 


@@ -53,7 +59,7 @@ send_to_server:
 
   # Some commonly-available cipher, we hope
   tls_require_ciphers =                ECDHE-RSA-AES256-GCM-SHA384
 
   # Some commonly-available cipher, we hope
   tls_require_ciphers =                ECDHE-RSA-AES256-GCM-SHA384

-  dane_require_tls_ciphers =   OPT
+  dane_require_tls_ciphers =   LIST

 
 # ----- Retry -----
 begin retry
 
 # ----- Retry -----
 begin retry