From: Daiki Ueno <dueno@redhat.com>
Date: Wed, 9 Jan 2019 12:58:30 +0000 (+0100)
Subject: trust: Fix alias generation in JKS extractor
X-Git-Tag: 0.23.15~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7289639cf41df1840002e865bf700f50afec523c;p=p11-kit

trust: Fix alias generation in JKS extractor

When there is a duplicate, the JKS extractor previously assigned
somewhat obscure name "-<digit>" (not "<name>-<digit>").
---

diff --git a/trust/extract-jks.c b/trust/extract-jks.c
index 33554df..c274e4f 100644
--- a/trust/extract-jks.c
+++ b/trust/extract-jks.c
@@ -191,6 +191,7 @@ add_alias (p11_buffer *buffer,
 	}
 
 	convert_alias (input, input_len, &buf);
+	length = buf.len;
 
 	for (i = 0; i < INT32_MAX; i++) {
 		if (i > 0) {
@@ -207,7 +208,7 @@ add_alias (p11_buffer *buffer,
 			return true;
 		}
 
-		p11_buffer_reset (&buf, 0);
+		buf.len = length;
 	}
 
 	return false;