From afdb5e9cf07fa49e26e128d8d5d2e3cab7a5fe42 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 21 Jun 2018 00:04:25 +0100 Subject: Expansions: A tls option on ${readsocket }. Bug 2282 --- test/confs/2099 | 16 ++++++++++++++++ test/confs/2199 | 16 ++++++++++++++++ test/log/2099 | 3 +++ test/log/2199 | 3 +++ test/scripts/2000-GnuTLS/2099 | 14 ++++++++++++++ test/scripts/2100-OpenSSL/2199 | 14 ++++++++++++++ test/stderr/2199 | 4 ++++ test/stdout/2099 | 4 ++++ test/stdout/2199 | 4 ++++ 9 files changed, 78 insertions(+) create mode 100644 test/confs/2099 create mode 100644 test/confs/2199 create mode 100644 test/log/2099 create mode 100644 test/log/2199 create mode 100644 test/scripts/2000-GnuTLS/2099 create mode 100644 test/scripts/2100-OpenSSL/2199 create mode 100644 test/stderr/2199 create mode 100644 test/stdout/2099 create mode 100644 test/stdout/2199 (limited to 'test') diff --git a/test/confs/2099 b/test/confs/2099 new file mode 100644 index 000000000..ce24e0967 --- /dev/null +++ b/test/confs/2099 @@ -0,0 +1,16 @@ +# Exim test configuration 2019 + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +log_selector = +tls_peerdn + +tls_advertise_hosts = * + +tls_certificate = DIR/aux-fixed/cert1 +tls_privatekey = DIR/aux-fixed/cert1 + +# End diff --git a/test/confs/2199 b/test/confs/2199 new file mode 100644 index 000000000..db3fbb0f0 --- /dev/null +++ b/test/confs/2199 @@ -0,0 +1,16 @@ +# Exim test configuration 2119 + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +log_selector = +tls_peerdn + +tls_advertise_hosts = * + +tls_certificate = DIR/aux-fixed/cert1 +tls_privatekey = DIR/aux-fixed/cert1 + +# End diff --git a/test/log/2099 b/test/log/2099 new file mode 100644 index 000000000..eb9d772d0 --- /dev/null +++ b/test/log/2099 @@ -0,0 +1,3 @@ + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225 diff --git a/test/log/2199 b/test/log/2199 new file mode 100644 index 000000000..eb9d772d0 --- /dev/null +++ b/test/log/2199 @@ -0,0 +1,3 @@ + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225 diff --git a/test/scripts/2000-GnuTLS/2099 b/test/scripts/2000-GnuTLS/2099 new file mode 100644 index 000000000..632dc094b --- /dev/null +++ b/test/scripts/2000-GnuTLS/2099 @@ -0,0 +1,14 @@ +# ${readsocket (IPv4 TLS) +need_ipv4 +# +exim -DSERVER=server -tls-on-connect -bd -oX PORT_D +**** +# +# +millisleep 500 +exim -be +1 >>${readsocket{inet:thisloop:PORT_D}{QUIT\n}{2s:tls=yes}}<< +**** +millisleep 500 +# +killdaemon diff --git a/test/scripts/2100-OpenSSL/2199 b/test/scripts/2100-OpenSSL/2199 new file mode 100644 index 000000000..632dc094b --- /dev/null +++ b/test/scripts/2100-OpenSSL/2199 @@ -0,0 +1,14 @@ +# ${readsocket (IPv4 TLS) +need_ipv4 +# +exim -DSERVER=server -tls-on-connect -bd -oX PORT_D +**** +# +# +millisleep 500 +exim -be +1 >>${readsocket{inet:thisloop:PORT_D}{QUIT\n}{2s:tls=yes}}<< +**** +millisleep 500 +# +killdaemon diff --git a/test/stderr/2199 b/test/stderr/2199 new file mode 100644 index 000000000..0423be152 --- /dev/null +++ b/test/stderr/2199 @@ -0,0 +1,4 @@ +1999-03-02 09:44:33 [NULL] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock +1999-03-02 09:44:33 [NULL] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="thisloop" + +******** SERVER ******** diff --git a/test/stdout/2099 b/test/stdout/2099 new file mode 100644 index 000000000..a3eab5117 --- /dev/null +++ b/test/stdout/2099 @@ -0,0 +1,4 @@ +> 1 >>220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +221 myhost.test.ex closing connection +<< +> diff --git a/test/stdout/2199 b/test/stdout/2199 new file mode 100644 index 000000000..a3eab5117 --- /dev/null +++ b/test/stdout/2199 @@ -0,0 +1,4 @@ +> 1 >>220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +221 myhost.test.ex closing connection +<< +> -- cgit v1.2.3