diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0275 | 10 | ||||
| -rw-r--r-- | test/confs/2002 | 21 | ||||
| -rw-r--r-- | test/confs/2102 | 30 | ||||
| -rw-r--r-- | test/confs/4500 | 16 | ||||
| -rw-r--r-- | test/confs/4520 | 9 |
5 files changed, 57 insertions, 29 deletions
diff --git a/test/confs/0275 b/test/confs/0275 index 3734e03ea..7117d517c 100644 --- a/test/confs/0275 +++ b/test/confs/0275 @@ -6,6 +6,8 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- +acl_smtp_rcpt = accept verify = recipient + domainlist nocache = $local_part domainlist nocache2 = +nocache domainlist local_domains = test.ex @@ -36,6 +38,14 @@ t1: begin routers +.ifdef FAKE +r0f: + driver = accept + local_parts = error + domains = +no_such_list + transport = t1 +.endif + r00: driver = accept domains = +nocache 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}} diff --git a/test/confs/2102 b/test/confs/2102 index 58ff6fbaa..0139a61c0 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -16,11 +16,21 @@ 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 +.ifdef ORDER +tls_require_ciphers = ORDER +.endif + +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,19 +40,9 @@ begin acl check_recipient: accept hosts = : deny hosts = HOSTIPV4 - !encrypted = AES256-SHA : \ - AES256-GCM-SHA384 : \ - AES128-GCM-SHA256 : \ - IDEA-CBC-MD5 : \ - DES-CBC3-SHA : \ - DHE-RSA-AES256-SHA : \ - DHE-RSA-AES256-GCM-SHA384 : \ - DHE_RSA_AES_256_CBC_SHA1 : \ - DHE_RSA_3DES_EDE_CBC_SHA : \ - ECDHE-RSA-AES256-GCM-SHA384 : \ - ECDHE-RSA-AES128-GCM-SHA256 : \ - ECDHE-RSA-CHACHA20-POLY1305 + !encrypted = * logwrite = cipher: $tls_in_cipher +# This appears to lie. Despite what's on the wire, it returns the last cert loaded. warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} diff --git a/test/confs/4500 b/test/confs/4500 index bf4f1f6ad..f2e44beff 100644 --- a/test/confs/4500 +++ b/test/confs/4500 @@ -9,9 +9,23 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- acl_smtp_rcpt = accept -acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length +acl_smtp_dkim = check_dkim queue_only queue_run_in_order + +begin acl + +check_dkim: +.ifdef OPTION + warn condition = ${if eq {$dkim_algo}{rsa-sha1}} + condition = ${if eq {$dkim_verify_status}{pass}} + logwrite = NOTE: forcing dkim verify fail (was pass) + set dkim_verify_status = fail + set dkim_verify_reason = hash too weak +.endif + accept + logwrite = signer: $dkim_cur_signer bits: $dkim_key_length + # End diff --git a/test/confs/4520 b/test/confs/4520 index 8fa3c38c8..3127d13b3 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -2,6 +2,7 @@ SERVER= OPT= +FAKE = .include DIR/aux-var/std_conf_prefix @@ -9,11 +10,15 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -acl_smtp_rcpt = accept logwrite = macro: _DKIM_SIGN_HEADERS -acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_rcpt = accept logwrite = rcpt acl: macro: _DKIM_SIGN_HEADERS +acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_data = accept logwrite = data acl: dkim status $dkim_verify_status + +dkim_verify_signers = $dkim_signers : FAKE DDIR=DIR/aux-fixed/dkim + # ----- Routers begin routers |