X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cbe4bbb27e59bf5e1d607d961b8d26ea09a9432c..49dc12554e8abfa11b764da14c65b93c545b6243:/test/scripts/2000-GnuTLS/2002?ds=inline diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002 index 1cfc293d5..cdaf56d68 100644 --- a/test/scripts/2000-GnuTLS/2002 +++ b/test/scripts/2000-GnuTLS/2002 @@ -21,9 +21,17 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 +ehlo rhu.barb +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 mail from: ??? 250 rcpt to: @@ -44,9 +52,12 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 +helo test +??? 250 mail from:<"name with spaces"@test.ex> ??? 250 rcpt to: @@ -59,19 +70,30 @@ This is a test encrypted message. quit ??? 221 **** -# Server asks for a client cert (?but client does not supply one?) +# +# Server asks for a client cert but client does not supply one client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D ??? 220 ehlo rhu.barb ??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 +??? 250-SIZE +??? 250-LIMITS +??? 250-8BITMIME +??? 250-PIPELINING +??? 250-STARTTLS +??? 250 HELP starttls -??? 220 +??? 220 TLS go ahead +nop +???* **** +# ensure sequence of log TLS error line +killdaemon +sleep 1 +exim -DSERVER=server -bd -oX PORT_D +**** +# +# # Server asks for a client cert, and one is given which is verifiable by the server client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key ??? 220 @@ -81,9 +103,12 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 +helo test +??? 250 mail from: ??? 250 rcpt to: @@ -111,9 +136,12 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 +helo test +??? 250 mail from: ??? 250 rcpt to: @@ -138,9 +166,12 @@ ehlo rhu.barb ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 +helo test +??? 250 mail from: ??? 250 rcpt to: @@ -155,8 +186,13 @@ quit ??? 221 **** killdaemon +sleep 1 +# clear out the queue exim -qf **** +sleep 1 +# +# STARTTLS used when not advertised exim -bh 10.0.0.1 starttls quit