(smime_to_pkcs7): Make sure PKCS#7 output use LF EOL.

diff --git a/src/certtool.c b/src/certtool.c
index b6166cc5cefe9fdb565447654594494cab08ca06..8d312af799b1fd12ec1c440c7353c63865a6df79 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -2703,8 +2703,10 @@ void smime_to_pkcs7(void)
 
   do
     {
-      if (strcmp (lineptr, "\r\n") != 0 && strcmp (lineptr, "\n") != 0)
-       printf("%s", lineptr);
+      while (len > 0 && (lineptr[len-1] == '\r' || lineptr[len-1] == '\n'))
+       lineptr[--len] = '\0';
+      if (strcmp (lineptr, "") != 0)
+       printf("%s\n", lineptr);
       len = getline (&lineptr, &linesize, infile);
     }
   while (len != -1);