Handle UTC vs specified-timezone for certificate extractors. Bug 1541

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

diff --git a/test/confs/2002 b/test/confs/2002
index dfb4feef5225f34da8fd8305de72e786014e2220..69fc749ff3d10409264e947f7a829453df8f9c02 100644 (file)
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+timezone = UTC

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


@@ -51,15 +52,18 @@ check_recipient:
          logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
          logwrite =  SN  <${certextract {subject}      {$tls_in_peercert}}>
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
          logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
          logwrite =  SN  <${certextract {subject}      {$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  <${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 =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}
 #        logwrite =       ${certextract {ocsp_uri}     {$tls_in_peercert} {OCU <$value>}{(no OCU)}}
          logwrite =       ${certextract {crl_uri}      {$tls_in_peercert} {CRU <$value>}{(no CRU)}}
           logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
          logwrite =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}
 #        logwrite =       ${certextract {ocsp_uri}     {$tls_in_peercert} {OCU <$value>}{(no OCU)}}
          logwrite =       ${certextract {crl_uri}      {$tls_in_peercert} {CRU <$value>}{(no CRU)}}

-         logwrite =  md5 fingerprint ${md5:$tls_in_peercert}
+         logwrite =  md5    fingerprint ${md5:$tls_in_peercert}

          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}

+         logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}

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