From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 14 Apr 2015 19:08:18 +0000 (+0300)
Subject: randomart: only print key size if it is non-zero
X-Git-Tag: gnutls_3_4_1~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd97b2945c306975c2142f4ffbad010849985cef;p=thirdparty%2Fgnutls.git

randomart: only print key size if it is non-zero
---

diff --git a/lib/extras/randomart.c b/lib/extras/randomart.c
index 3b7bf8adc9..74f44effcf 100644
--- a/lib/extras/randomart.c
+++ b/lib/extras/randomart.c
@@ -74,6 +74,7 @@ char *_gnutls_key_fingerprint_randomart(uint8_t * dgst_raw,
 	const char augmentation_string[] = " .o+=*BOX@%&#/^SE";
 	char *retval, *p;
 	uint8_t field[FLDSIZE_X][FLDSIZE_Y];
+	char size_txt[16];
 	unsigned int i, b;
 	int x, y;
 	const size_t len = sizeof(augmentation_string) - 2;
@@ -122,13 +123,18 @@ char *_gnutls_key_fingerprint_randomart(uint8_t * dgst_raw,
 	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
 	field[x][y] = len;
 
+	if (key_size > 0)
+		snprintf(size_txt, " %4u", key_size);
+	else
+		size_txt[0] = 0;
+
 	/* fill in retval */
 	if (prefix_len)
-		snprintf(retval, FLDSIZE_X + prefix_len, "%s+--[%4s %4u]",
-			 prefix, key_type, key_size);
+		snprintf(retval, FLDSIZE_X + prefix_len, "%s+--[%4s%s]",
+			 prefix, key_type, size_txt);
 	else
-		snprintf(retval, FLDSIZE_X, "+--[%4s %4u]", key_type,
-			 key_size);
+		snprintf(retval, FLDSIZE_X, "+--[%4s%s]", key_type,
+			 size_txt);
 	p = strchr(retval, '\0');
 
 	/* output upper border */