From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 4 Jan 2017 08:10:54 +0000 (+0100)
Subject: _gnutls_pkcs12_string_to_key: avoid division by zero when salt_size = 0
X-Git-Tag: gnutls_3_6_0~1096
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f449ce8ea94ef2fc6d26547946dc7189feeea9cd;p=thirdparty%2Fgnutls.git

_gnutls_pkcs12_string_to_key: avoid division by zero when salt_size = 0

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index 1114d7300a..557301a197 100644
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -111,9 +111,15 @@ _gnutls_pkcs12_string_to_key(const mac_entry_st * me,
 		goto cleanup;
 	}
 
-	p = buf_i;
-	for (i = 0; i < 64; i++)
-		*p++ = salt[i % salt_size];
+
+	if (salt_size > 0) {
+		p = buf_i;
+		for (i = 0; i < 64; i++)
+			*p++ = salt[i % salt_size];
+	} else {
+		memset(buf_i, 0, 64);
+		p = buf_i + 64;
+	}
 
 	if (pw) {
 		for (i = j = 0; i < p_size; i += 2) {