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
testcase
[users/jgh/exim.git]
/
test
/
confs
/
2002
diff --git
a/test/confs/2002
b/test/confs/2002
index b4d0348cadb4658218e11213eb00fa59fe126307..679dccf96c24bf22ab1ea4796f993ccf3a1018b0 100644
(file)
--- a/
test/confs/2002
+++ b/
test/confs/2002
@@
-1,13
+1,14
@@
# Exim test configuration 2002
exim_path = EXIM_PATH
# Exim test configuration 2002
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
primary_hostname = myhost.test.ex
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
+41,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}}
@@
-51,13
+53,19
@@
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 = NA <${certextract {notafter} {$tls_in_peercert}}>
- logwrite = SA <${certextract {sig
nature
_algorithm}{$tls_in_peercert}}>
+ logwrite = SA <${certextract {sig_algorithm}{$tls_in_peercert}}>
logwrite = SG <${certextract {signature} {$tls_in_peercert}}>
logwrite = SG <${certextract {signature} {$tls_in_peercert}}>
- logwrite = ${certextract {subj
ect_altname}
{$tls_in_peercert} {SAN <$value>}{(no SAN)}}
+ 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 = ${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 = sha1 fingerprint ${sha1:$tls_in_peercert}
+ logwrite = sha256 fingerprint ${sha256:$tls_in_peercert}
+ logwrite = der_b64 ${base64:$tls_in_peercert}
# ----- Routers -----
# ----- Routers -----