X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F5841;h=ccecd7e1f1607180ef7cf37c4b7a5b3e0f4f4a97;hb=7ef88aa0c4c0608ee54ed2ff90b4b34c518d9bb5;hp=57d692826af3dd3181075029e3c0adb69346b026;hpb=5d4da40d5b25b4f4029b46246c9757b42929bd87;p=exim.git

diff --git a/test/confs/5841 b/test/confs/5841
index 57d692826..ccecd7e1f 100644
--- a/test/confs/5841
+++ b/test/confs/5841
@@ -2,7 +2,7 @@
 # DANE/OpenSSL - ciphers option
 
 SERVER=
-OPT=
+LIST=
 
 .include DIR/aux-var/tls_conf_prefix
 
@@ -23,7 +23,13 @@ tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem}fail}
 tls_privatekey =  ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key}fail}
 
 # Permit two specific ciphers
-tls_require_ciphers = ECDHE-RSA-CAMELLIA256-SHA384:ECDHE-RSA-AES256-GCM-SHA384
+tls_require_ciphers = DHE-RSA-CAMELLIA256-SHA: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
@@ -53,7 +59,7 @@ send_to_server:
 
   # 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