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
Fix smtp transport certificate-verification option matching to use correct host
[users/jgh/exim.git]
/
test
/
confs
/
5450
diff --git
a/test/confs/5450
b/test/confs/5450
index 398871c64f2943d1b9b0b16c670c06f857af7f9a..953b4742390a9b44055afd756492ded746976307 100644
(file)
--- a/
test/confs/5450
+++ b/
test/confs/5450
@@
-1,5
+1,5
@@
-# Exim test configuration
2112
-# TLS client: verify certificate from server - fails
+# Exim test configuration
5450
+# TLS client: verify certificate from server -
name-
fails
SERVER=
SERVER=
@@
-88,6
+88,12
@@
client_s:
retry_use_local_part
transport = send_to_server_req_passname
retry_use_local_part
transport = send_to_server_req_passname
+client_t:
+ driver = accept
+ local_parts = usert
+ retry_use_local_part
+ transport = send_to_server_req_failcarryon
+
# ----- Transports -----
# ----- Transports -----
@@
-131,11
+137,12
@@
send_to_server_crypt:
tls_verify_certificates = CA2
tls_try_verify_hosts = *
tls_verify_certificates = CA2
tls_try_verify_hosts = *
-# this will fail to verify the cert at HOSTIPV4 and fallback to unencrypted
+# this will fail to verify the cert at HOSTNAME and fallback to unencrypted
+# Fail due to lack of correct CA
send_to_server_req_fail:
driver = smtp
allow_localhost
send_to_server_req_fail:
driver = smtp
allow_localhost
- hosts = HOST
IPV4
+ hosts = HOST
NAME
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
@@
-144,29
+151,43
@@
send_to_server_req_fail:
tls_verify_hosts = *
# this will fail to verify the cert name and fallback to unencrypted
tls_verify_hosts = *
# this will fail to verify the cert name and fallback to unencrypted
+# fail because the cert is "server1.example.com" and the test system is something else
send_to_server_req_failname:
driver = smtp
allow_localhost
send_to_server_req_failname:
driver = smtp
allow_localhost
- hosts = HOST
IPV4
+ hosts = HOST
NAME
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
tls_verify_certificates = CA1
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
tls_verify_certificates = CA1
- tls_verify_cert_hostnames =
server1.example.net : server1.example.org
+ tls_verify_cert_hostnames =
*
tls_verify_hosts = *
# this will pass the cert verify including name check
tls_verify_hosts = *
# this will pass the cert verify including name check
+# our stunt DNS has an A record for server1.example.com -> HOSTIPV4
send_to_server_req_passname:
driver = smtp
allow_localhost
send_to_server_req_passname:
driver = smtp
allow_localhost
- hosts =
HOSTIPV4
+ hosts =
server1.example.com
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
tls_verify_certificates = CA1
port = PORT_D
tls_certificate = CERT2
tls_privatekey = CERT2
tls_verify_certificates = CA1
- tls_verify_cert_hostnames =
noway.example.com : server1.example.com
+ tls_verify_cert_hostnames =
*
tls_verify_hosts = *
tls_verify_hosts = *
+send_to_server_req_failcarryon:
+ driver = smtp
+ allow_localhost
+ hosts = HOSTNAME
+ port = PORT_D
+ tls_certificate = CERT2
+ tls_privatekey = CERT2
+
+ tls_verify_certificates = CA1
+ tls_verify_cert_hostnames = *
+ tls_try_verify_hosts = *
+
# End
# End