tests: Fix the line endings for the SASL alt-auth tests

- Change data and protocol sections to CRLF line endings.

Prior to this change the tests would fail or hang, which is because
certain sections such as protocol require CRLF line endings.

Follow-up to grandparent commit which added the tests.

Ref: https://github.com/curl/curl/issues/3653
Ref: https://github.com/curl/curl/pull/3790

NOTE: This commit was cherry-picked and is part of a series of commits
that added the authzid feature for upcoming 7.66.0. The series was
temporarily reverted in db8ec1f so that it would not ship in a 7.65.x
patch release.

Closes https://github.com/curl/curl/pull/4186

diff --git a/tests/data/test848 b/tests/data/test848
index bfea5689888dc47e0315627e937f4cd93147ebd3..2b4a30b2a34c072f88025a9b060d3119f50b17d1 100644 (file)
--- a/tests/data/test848
+++ b/tests/data/test848
@@ -17,13 +17,13 @@ REPLY AUTHENTICATE +
 REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed
 </servercmd>
 <data>
-From: me@somewhere
-To: fake@nowhere
-
-body
-
---
-  yours sincerely
+From: me@somewhere\r
+To: fake@nowhere\r
+\r
+body\r
+\r
+--\r
+  yours sincerely\r
 </data>
 </reply>
 
@@ -45,12 +45,12 @@ IMAP plain authentication with alternative authorization identity
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-A001 CAPABILITY
-A002 AUTHENTICATE PLAIN
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-A003 SELECT 848
-A004 FETCH 1 BODY[]
-A005 LOGOUT
+A001 CAPABILITY\r
+A002 AUTHENTICATE PLAIN\r
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
+A003 SELECT 848\r
+A004 FETCH 1 BODY[]\r
+A005 LOGOUT\r
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/data/test849 b/tests/data/test849
index 65d5eacf7bf93aff8cd9fac798ebc9e7c8f8dfa1..8a4b39c00d6d6b13dc98e60206eff8f458981044 100644 (file)
--- a/tests/data/test849
+++ b/tests/data/test849
@@ -43,9 +43,9 @@ IMAP plain authentication with alternative authorization identity (Not authorize
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
 <protocol>
-A001 CAPABILITY
-A002 AUTHENTICATE PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+A001 CAPABILITY\r
+A002 AUTHENTICATE PLAIN\r
+dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/data/test892 b/tests/data/test892
index 89a56fbc45abbcf2c0b4d456150e1a58c1dba065..4b8318292d7e7a2865665083e4cb3fd1ebf45be4 100644 (file)
--- a/tests/data/test892
+++ b/tests/data/test892
@@ -19,13 +19,13 @@ REPLY AUTH +
 REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful
 </servercmd>
 <data>
-From: me@somewhere
-To: fake@nowhere
-
-body
-
---
-  yours sincerely
+From: me@somewhere\r
+To: fake@nowhere\r
+\r
+body\r
+\r
+--\r
+  yours sincerely\r
 </data>
 </reply>
 
@@ -47,11 +47,11 @@ pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CAPA
-AUTH PLAIN
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-RETR 892
-QUIT
+CAPA\r
+AUTH PLAIN\r
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=\r
+RETR 892\r
+QUIT\r
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/data/test893 b/tests/data/test893
index 982c2c897b3dbb0bfdfee7782159728c47374195..2a762fc218d02e4e8f6ef0a84c3dba1f0098d496 100644 (file)
--- a/tests/data/test893
+++ b/tests/data/test893
@@ -45,9 +45,9 @@ pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-CAPA
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+CAPA\r
+AUTH PLAIN\r
+dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/data/test953 b/tests/data/test953
index a7636dc22e196bb2ac1ad6ddb7e51cb8aabb1d07..4a70e1f31d6173a0c88b07ae3894d161257610a2 100644 (file)
--- a/tests/data/test953
+++ b/tests/data/test953
@@ -29,7 +29,7 @@ smtp
 SMTP plain authentication with alternative authorization identity
  </name>
 <stdin>
-mail body
+mail body\r
 </stdin>
  <command>
 smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
@@ -40,17 +40,17 @@ smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 953
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
-DATA
-QUIT
+EHLO 953\r
+AUTH PLAIN\r
+dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
+MAIL FROM:<sender@example.com>\r
+RCPT TO:<recipient@example.com>\r
+DATA\r
+QUIT\r
 </protocol>
 <upload>
-mail body
-.
+mail body\r
+.\r
 </upload>
 </verify>
 </testcase>

diff --git a/tests/data/test954 b/tests/data/test954
index dcc0d2d0ba94da5531db79f5a72ce232afefba5c..a5e6bb0d3760e48293fcdf6b326ecd2a6519a6ae 100644 (file)
--- a/tests/data/test954
+++ b/tests/data/test954
@@ -47,9 +47,9 @@ smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 954
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+EHLO 954\r
+AUTH PLAIN\r
+dXJzZWwAa3VydAB4aXBqM3BsbXE=\r
 </protocol>
 </verify>
 </testcase>