[Mime] Ensure proper line-ending for SMIME

sstok · sstok · commit 5e3ccc28143e · 2020-04-16T13:38:11.000+02:00
diff --git a/src/Symfony/Component/Mime/Crypto/SMime.php b/src/Symfony/Component/Mime/Crypto/SMime.php
@@ -65,7 +65,7 @@ protected function convertMessageToSMimePart($stream, string $type, string $subt
     protected function getStreamIterator($stream): iterable
     {
         while (!feof($stream)) {
-            yield fread($stream, 16372);
+            yield str_replace("\n", "\r\n", str_replace("\r\n", "\n", fread($stream, 16372)));
         }
     }
 
diff --git a/src/Symfony/Component/Mime/Tests/Crypto/SMimeEncryptorTest.php b/src/Symfony/Component/Mime/Tests/Crypto/SMimeEncryptorTest.php
@@ -87,7 +87,11 @@ public function testEncryptMessageWithMultipleCerts()
     private function assertMessageIsEncryptedProperly(Message $message, Message $originalMessage): void
     {
         $messageFile = $this->generateTmpFilename();
-        file_put_contents($messageFile, $message->toString());
+        file_put_contents($messageFile, $messageString = $message->toString());
+
+        // Ensure the proper line-ending is used for compatibility with the RFC
+        $this->assertStringContainsString("\n\r", $messageString);
+        $this->assertStringNotContainsString("\n\n", $messageString);
 
         $outputFile = $this->generateTmpFilename();
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function convertMessageToSMimePart($stream, string $type, string $subt`
`65`	`65`	`protected function getStreamIterator($stream): iterable`
`66`	`66`	`{`
`67`	`67`	`while (!feof($stream)) {`
`68`		`- yield fread($stream, 16372);`
	`68`	`+ yield str_replace("\n", "\r\n", str_replace("\r\n", "\n", fread($stream, 16372)));`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`