diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-11 16:20:02 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-11 16:20:02 +0000 |
| commit | 3af849e2045f7c580d4c533d829dc9d567162d36 (patch) | |
| tree | 068147ead2853f69f74af6587c2481b540d97f00 /test/confs/2002 | |
| parent | 3f4f5e7256a81b2e8154611174934aa5b6c57ad7 (diff) | |
| parent | 72934ba73e5ac5fbd64b56dc684e3371a9651909 (diff) | |
Merge branch 'master' into 4.next
Diffstat (limited to 'test/confs/2002')
| -rw-r--r-- | test/confs/2002 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/test/confs/2002 b/test/confs/2002 index ccbe6f192..dfeb172b1 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -16,11 +16,17 @@ queue_run_in_order tls_advertise_hosts = 127.0.0.1 : HOSTIPV4 -tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem -tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key +CA = DIR/aux-fixed/exim-ca +DRSA = CA/example.com +DECDSA = CA/example_ec.com + +tls_certificate = DRSA/server1.example.com/server1.example.com.pem \ + : DECDSA/server1.example_ec.com/server1.example_ec.com.pem +tls_privatekey = DRSA/server1.example.com/server1.example.com.unlocked.key \ + : DECDSA/server1.example_ec.com/server1.example_ec.com.unlocked.key tls_verify_hosts = HOSTIPV4 -tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem +tls_verify_certificates = DRSA/server2.example.com/ca_chain.pem # ------ ACL ------ @@ -30,14 +36,7 @@ begin acl check_recipient: accept hosts = : deny hosts = HOSTIPV4 - !encrypted = AES256-SHA : \ - AES256-GCM-SHA384 : \ - IDEA-CBC-MD5 : \ - DES-CBC3-SHA : \ - DHE_RSA_AES_256_CBC_SHA1 : \ - DHE_RSA_3DES_EDE_CBC_SHA : \ - RSA_AES_256_CBC_SHA1 : \ - ECDHE_RSA_AES_256_GCM_SHA384 + !encrypted = * warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} |