From 2232bf101e5d83c8782b4a9e93ed70f5a657e1d3 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 5 Apr 2017 14:26:52 +0200 Subject: certtool: fixed newline skip code in smime-to-p7 code Signed-off-by: Nikos Mavrogiannopoulos --- src/certtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/certtool.c b/src/certtool.c index 38e0ecd61c..c0103f19d8 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -3781,6 +3781,7 @@ void smime_to_pkcs7(void) } while (strcmp(lineptr, "\r\n") != 0 && strcmp(lineptr, "\n") != 0); + /* skip newlines */ do { len = getline(&lineptr, &linesize, infile); if (len == -1) { @@ -3789,7 +3790,7 @@ void smime_to_pkcs7(void) app_exit(1); } } - while (strcmp(lineptr, "\r\n") == 0 && strcmp(lineptr, "\n") == 0); + while (strcmp(lineptr, "\r\n") == 0 || strcmp(lineptr, "\n") == 0); fprintf(outfile, "%s", "-----BEGIN PKCS7-----\n"); -- cgit v1.2.1