diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-10-22 21:12:52 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-10-22 22:18:48 +0100 |
| commit | f175bef138f45415b9559ee47c7be342ecb95ae0 (patch) | |
| tree | 381b30c3678dbfe31d263926f08e12fd2b5aa6d5 | |
| parent | 3ce8303e1f38b3e48f05a3636533181ed4b242a8 (diff) | |
Testsuite: Add testcase for GnuTLS disconnect after STARTTLS
| -rw-r--r-- | test/log/2015 | 3 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2015 | 14 | ||||
| -rw-r--r-- | test/stdout/2015 | 20 |
3 files changed, 36 insertions, 1 deletions
diff --git a/test/log/2015 b/test/log/2015 index 9f5998640..7252550ca 100644 --- a/test/log/2015 +++ b/test/log/2015 @@ -4,3 +4,6 @@ 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (gnutls_handshake): timed out 1999-03-02 09:44:33 SMTP command timeout on connection from (rhu.barb) [127.0.0.1] +1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) +1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (gnutls_handshake): The TLS connection was non-properly terminated. +1999-03-02 09:44:33 SMTP connection from (rhu.barb) [127.0.0.1] closed by EOF diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015 index 140af797f..b963e4e06 100644 --- a/test/scripts/2000-GnuTLS/2015 +++ b/test/scripts/2000-GnuTLS/2015 @@ -1,4 +1,4 @@ -# TLS server: timeout after accepting STARTTLS +# TLS server: timeout or close after accepting STARTTLS gnutls exim -DSERVER=server -bd -oX PORT_D **** @@ -16,4 +16,16 @@ starttls_wait +++ 2 ??? 421 **** +client-gnutls 127.0.0.1 PORT_D +??? 220 +ehlo rhu.barb +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +starttls_wait +??? 220 +**** killdaemon diff --git a/test/stdout/2015 b/test/stdout/2015 index fd6174058..42fe5c0fd 100644 --- a/test/stdout/2015 +++ b/test/stdout/2015 @@ -21,3 +21,23 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 421 <<< 421 myhost.test.ex: SMTP command timeout - closing connection End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo rhu.barb +??? 250- +<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-STARTTLS +??? 250 +<<< 250 HELP +>>> starttls +??? 220 +<<< 220 TLS go ahead +End of script |