Testsuite: shuffling

[users/heiko/exim.git] / test / stdout / 2002

diff --git a/test/stdout/2002 b/test/stdout/2002
index a248be7c0a2aee565bc71d09814e96755f664f6b..276c903e6ace01e4154678b103eb19736397cb82 100644 (file)
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -80,6 +80,34 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> ehlo rhu.barb
 ??? 250-
 <<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
 >>> ehlo rhu.barb
 ??? 250-
 <<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]

+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
+<<< 250-PIPELINING
+??? 250-STARTTLS
+<<< 250-STARTTLS
+??? 250 HELP
+<<< 250 HELP
+>>> starttls
+??? 220 TLS go ahead
+<<< 220 TLS go ahead
+Attempting to start TLS
+A TLS fatal alert has been received.
+Failed to start TLS
+>>> nop
+???*
+Expected EOF read
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+??? 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 [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -94,16 +122,30 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-Failed to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message from a verified host.
+>>> .
+??? 250
+<<< 250 OK id=10HmaZ-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex closing connection

 End of script
 End of script

-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = TESTSUITE/aux-fixed/cert2
-Key file = TESTSUITE/aux-fixed/cert2
+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-
 ??? 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 [ip4.ip4.ip4.ip4]
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-


@@ -128,10 +170,50 @@ Succeeded in starting TLS
 >>> DATA
 ??? 3
 <<< 354 Enter message, ending with "." on a line by itself
 >>> DATA
 ??? 3
 <<< 354 Enter message, ending with "." on a line by itself

->>> This is a test encrypted message from a verified host.
+>>> This is a test encrypted message.
+>>> It should be sent under the RSA server cert and with an RSA cipher.

 >>> .
 ??? 250
 >>> .
 ??? 250

-<<< 250 OK id=10HmaZ-0005vi-00
+<<< 250 OK id=10HmbA-0005vi-00
+>>> quit
+??? 221
+<<< 221 myhost.test.ex 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
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<CALLER@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<CALLER@test.ex>
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 3
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test encrypted message.
+>>> It should be sent under the EC server cert and with an ECDSA cipher.
+>>> .
+??? 250
+<<< 250 OK id=10HmbB-0005vi-00

 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection
 >>> quit
 ??? 221
 <<< 221 myhost.test.ex closing connection