DKIM: support oversigning. Bugs 1309, 1310

[users/jgh/exim.git] / test / confs / 2002

diff --git a/test/confs/2002 b/test/confs/2002
index dc958ec38eb1a1b0fe5f21de5ab7a55787c821ef..76e6f1eec0f0dd8a48af2caf2168ee1487f5ec8a 100644 (file)
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -3,11 +3,11 @@
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+timezone = UTC

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -40,7 +40,8 @@ check_recipient:
                       DES-CBC3-SHA : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
                       DHE_RSA_3DES_EDE_CBC_SHA : \
                       DES-CBC3-SHA : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
                       DHE_RSA_3DES_EDE_CBC_SHA : \

-                      RSA_AES_256_CBC_SHA1
+                      RSA_AES_256_CBC_SHA1 : \
+                     ECDHE_RSA_AES_256_GCM_SHA384

   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}
   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}


@@ -53,6 +54,7 @@ check_recipient:
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
           logwrite =  IN/O <${certextract {issuer,O}   {$tls_in_peercert}}>
           logwrite =  NB  <${certextract {notbefore}   {$tls_in_peercert}}>
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
           logwrite =  IN/O <${certextract {issuer,O}   {$tls_in_peercert}}>
           logwrite =  NB  <${certextract {notbefore}   {$tls_in_peercert}}>

+          logwrite =  NB/i <${certextract {notbefore,int}{$tls_in_peercert}}>

           logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
           logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>


@@ -62,6 +64,7 @@ check_recipient:
          logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
          logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}

+         logwrite =  der_b64 ${base64:$tls_in_peercert}

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----