summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-04-05 14:26:52 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-04-05 14:54:49 +0200
commit1b6cd4b46aba7f2d4503d8790e96b0553017183a (patch)
tree9cd64ac199db0df4e3ab304c69f7448e008a6369
parent1ded3ae173d93082a46628511615b22c8ff5c1ab (diff)
downloadgnutls_3_5_x-backport-coverity-fixes.tar.gz
certtool: fixed newline skip code in smime-to-p7 codegnutls_3_5_x-backport-coverity-fixes
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--src/certtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/certtool.c b/src/certtool.c
index 00126b60d4..3c736a3ce4 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3805,6 +3805,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) {
@@ -3813,7 +3814,7 @@ void smime_to_pkcs7(void)
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");