Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / stdout / 3721

diff --git a/test/stdout/3721 b/test/stdout/3721
index 210bf43d33a4468302d7cdef5a6bf1d7c136cef6..8fc42f57fd1e11fc2060f3c78d5d2ccfebe97aa3 100644 (file)
--- a/test/stdout/3721
+++ b/test/stdout/3721
@@ -1,6 +1,6 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 Connecting to 127.0.0.1 port 1225 ... connected

-Certificate file = TESTSUITE/aux-fixed/cert2
-Key file = TESTSUITE/aux-fixed/cert2
+Certificate file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+Key file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key

 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO tester
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO tester


@@ -9,6 +9,8 @@ Key file = TESTSUITE/aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -20,7 +22,6 @@ Key file = TESTSUITE/aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAnnn

 Succeeded in starting TLS
 >>> EHLO tester
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO tester
 ??? 250-


@@ -28,6 +29,8 @@ Succeeded in starting TLS
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -35,7 +38,7 @@ Succeeded in starting TLS
 <<< 250-AUTH EXTERNAL
 ??? 250 HELP
 <<< 250 HELP
 <<< 250-AUTH EXTERNAL
 ??? 250 HELP
 <<< 250 HELP

->>> AUTH EXTERNAL UGhpbCBQZW5ub2Nr
+>>> AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==

 ??? 235
 <<< 235 Authentication succeeded
 >>> quit
 ??? 235
 <<< 235 Authentication succeeded
 >>> quit