git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep router-variables separate on addrs, to avoid taint contamination
[users/jgh/exim.git]
/
test
/
confs
/
5821
diff --git
a/test/confs/5821
b/test/confs/5821
index 86ddbdedd6d0e472dd741d0c78d47377e69170e0..97d0cb8fa44e7665e3f8ebed1a6138c7b8aca085 100644
(file)
--- a/
test/confs/5821
+++ b/
test/confs/5821
@@
-1,5
+1,5
@@
# Exim test configuration 5821
# Exim test configuration 5821
-# DANE/
OpenSSL
- ciphers option
+# DANE/
GnuTLS
- ciphers option
SERVER=
OPT=
SERVER=
OPT=
@@
-23,7
+23,7
@@
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_privatekey = ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key}fail}
# Permit two specific ciphers
-tls_require_ciphers = NORMAL:-KX-ALL:+RSA:-CIPHER-ALL:+AES-128-CBC:+CAMELLIA-256-GCM
+tls_require_ciphers = NORMAL:-
VERS-ALL:+VERS-TLS1.2:-
KX-ALL:+RSA:-CIPHER-ALL:+AES-128-CBC:+CAMELLIA-256-GCM
# ----- Routers -----
begin routers
# ----- Routers -----
begin routers