From b1b227fa5e00d08af047ab9a012211b66c6b0f13 Mon Sep 17 00:00:00 2001
From: Bjørn Mork <bjorn@mork.no>
Date: Fri, 15 May 2015 10:25:18 +0200
Subject: ripe-atlas-fw: imported version 4610
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 eperd/sslgetcert.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'eperd/sslgetcert.c')

diff --git a/eperd/sslgetcert.c b/eperd/sslgetcert.c
index 5b18b33..2b71cc4 100644
--- a/eperd/sslgetcert.c
+++ b/eperd/sslgetcert.c
@@ -909,7 +909,7 @@ static int eat_server_hello(struct state *state)
 
 static int eat_certificate(struct state *state)
 {
-	int i, n, r, first, slen;
+	int i, n, r, first, slen, need_nl;
 	size_t o, len;
 	uint8_t *p;
 	struct msgbuf *msgbuf;
@@ -1019,14 +1019,23 @@ static int eat_certificate(struct state *state)
 			buf_add_b64(&tmpbuf, p+o+3, slen);
 			fprintf(fh, "%s\"-----BEGIN CERTIFICATE-----\\n",
 				!first ? ", " : "");
+			need_nl= 0;
 			for (i= tmpbuf.offset; i<tmpbuf.size; i++)
 			{
 				if (tmpbuf.buf[i] == '\n')
+				{
 					fputs("\\n", fh);
+					need_nl= 0;
+				}
 				else
+				{
 					fputc(tmpbuf.buf[i], fh);
+					need_nl= 1;
+				}
 			}
-			fprintf(fh, "\\n-----END CERTIFICATE-----\"");
+			if (need_nl)
+				fputs("\\n", fh);
+			fprintf(fh, "-----END CERTIFICATE-----\"");
 			tmpbuf.size= tmpbuf.offset;
 			o += 3+slen;
 			first= 0;
-- 
cgit v1.2.3