diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-20 20:07:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-21 14:55:24 +0100 |
| commit | 099afc4f7362d39816cb3555127214548dd9cb35 (patch) | |
| tree | 273898f153f8c8dedfdc0d9178bf2804022e78aa /test/scripts/2000-GnuTLS | |
| parent | 3b7ac02caeb878252361e602dc46e96104f773a9 (diff) | |
Ensure unique message-id even for rejected messages
Diffstat (limited to 'test/scripts/2000-GnuTLS')
| -rw-r--r-- | test/scripts/2000-GnuTLS/2014 | 6 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2015 | 5 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2024 | 6 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2034 | 5 |
4 files changed, 15 insertions, 7 deletions
diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014 index 1e12b4ef5..8c23e2cdf 100644 --- a/test/scripts/2000-GnuTLS/2014 +++ b/test/scripts/2000-GnuTLS/2014 @@ -15,6 +15,8 @@ ehlo rhu1.barb ??? 250 starttls ??? 220 +nop +????554 **** ### No certificate, certificate optional at TLS time, required by ACL client-gnutls 127.0.0.1 PORT_D @@ -89,6 +91,8 @@ ehlo rhu5.barb ??? 250 starttls ??? 220 +nop +????554 **** ### Bad certificate, certificate optional at TLS time, reject at ACL time # (situation as above) @@ -153,7 +157,7 @@ quit ### Good certificate, certificate required - but nonmatching CRL also present client-gnutls HOSTIPV4 PORT_D aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key ??? 220 -ehlo rhu.barb +ehlo rhu9.barb ??? 250- ??? 250- ??? 250- diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015 index b963e4e06..07fda35b3 100644 --- a/test/scripts/2000-GnuTLS/2015 +++ b/test/scripts/2000-GnuTLS/2015 @@ -4,7 +4,7 @@ exim -DSERVER=server -bd -oX PORT_D **** client-gnutls 127.0.0.1 PORT_D ??? 220 -ehlo rhu.barb +ehlo timeout.rhu.barb ??? 250- ??? 250- ??? 250- @@ -18,7 +18,7 @@ starttls_wait **** client-gnutls 127.0.0.1 PORT_D ??? 220 -ehlo rhu.barb +ehlo close.rhu.barb ??? 250- ??? 250- ??? 250- @@ -28,4 +28,5 @@ ehlo rhu.barb starttls_wait ??? 220 **** +millisleep 500 killdaemon diff --git a/test/scripts/2000-GnuTLS/2024 b/test/scripts/2000-GnuTLS/2024 index a2ad20446..307fde706 100644 --- a/test/scripts/2000-GnuTLS/2024 +++ b/test/scripts/2000-GnuTLS/2024 @@ -11,7 +11,7 @@ exim -DSERVER=server -bd -oX PORT_D munge gnutls_bad_clientcert client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2 ??? 220 -ehlo rhu.barb +ehlo rhu1.barb ??? 250- ??? 250- ??? 250- @@ -20,6 +20,8 @@ ehlo rhu.barb ??? 250 starttls ??? 220 +nop +????554 **** killdaemon # @@ -28,7 +30,7 @@ exim -DSERVER=server -DCERT=/non/exist -bd -oX PORT_D **** client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2 ??? 220 -ehlo rhu.barb +ehlo rhu2.barb ??? 250- ??? 250- ??? 250- diff --git a/test/scripts/2000-GnuTLS/2034 b/test/scripts/2000-GnuTLS/2034 index b03c60d93..c8654f1aa 100644 --- a/test/scripts/2000-GnuTLS/2034 +++ b/test/scripts/2000-GnuTLS/2034 @@ -5,7 +5,7 @@ exim -DSERVER=server -bd -oX PORT_D # timeout case client 127.0.0.1 PORT_D ??? 220 -ehlo rhu.barb +ehlo rhu1.barb ??? 250- ??? 250- ??? 250- @@ -20,7 +20,7 @@ starttls # bad TLS negotiation case client 127.0.0.1 PORT_D ??? 220 -ehlo rhu.barb +ehlo rhu2.barb ??? 250- ??? 250- ??? 250- @@ -31,4 +31,5 @@ starttls ??? 220 bogus **** +millisleep 500 killdaemon |