[PATCH v2] cert: Fix warning of possible uninitialized var

[PATCH v2] cert: Fix warning of possible uninitialized var

[Brian Gix]

[-- Attachment #1: Type: text/plain, Size: 1484 bytes --]

ell/cert-crypto.c: In function ‘cert_pkcs12_pbkdf’:
ell/cert-crypto.c:244:3: error: ‘bmpstring’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
  244 |   explicit_bzero(bmpstring, passwd_len);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 ell/cert-crypto.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ell/cert-crypto.c b/ell/cert-crypto.c
index 6eb4e14..838d5b5 100644
--- a/ell/cert-crypto.c
+++ b/ell/cert-crypto.c
@@ -198,7 +198,8 @@ uint8_t *cert_pkcs12_pbkdf(const char *password,
 	/* Documented as v(ceiling(s/v)), usually will just equal v */
 	unsigned int s_len = (salt_len + hash->v - 1) & ~(hash->v - 1);
 	/* Documented as p(ceiling(s/p)), usually will just equal v */
-	unsigned int p_len = (passwd_len + hash->v - 1) & ~(hash->v - 1);
+	unsigned int p_len = password ?
+			(passwd_len + hash->v - 1) & ~(hash->v - 1) : 0;
 	uint8_t di[hash->v + s_len + p_len];
 	uint8_t *ptr;
 	unsigned int j;
@@ -235,10 +236,11 @@ uint8_t *cert_pkcs12_pbkdf(const char *password,
 		ptr += s_len + salt_len - j;
 	}
 
-	for (j = passwd_len; j < p_len; j += passwd_len, ptr += passwd_len)
-		memcpy(ptr, bmpstring, passwd_len);
-
 	if (p_len) {
+		for (j = passwd_len; j < p_len;
+					j += passwd_len, ptr += passwd_len)
+			memcpy(ptr, bmpstring, passwd_len);
+
 		memcpy(ptr, bmpstring, p_len + passwd_len - j);
 
 		explicit_bzero(bmpstring, passwd_len);
-- 
2.25.4

Re: [PATCH v2] cert: Fix warning of possible uninitialized var

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

Andrew,

On 1/18/21 12:20 PM, Brian Gix wrote:
> ell/cert-crypto.c: In function ‘cert_pkcs12_pbkdf’:
> ell/cert-crypto.c:244:3: error: ‘bmpstring’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
>    244 |   explicit_bzero(bmpstring, passwd_len);
>        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ---
>   ell/cert-crypto.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 

Do you have any comments on this patch or should I take it in?

Regards,
-Denis

Re: [PATCH v2] cert: Fix warning of possible uninitialized var

[Andrew Zaborowski]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

Hi Denis,

On Fri, 22 Jan 2021 at 17:15, Denis Kenzior <denkenz@gmail.com> wrote:
> Do you have any comments on this patch or should I take it in?

No comments, it looks good to me.

Best regards

Re: [PATCH v2] cert: Fix warning of possible uninitialized var

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi Brian,

On 1/18/21 12:20 PM, Brian Gix wrote:
> ell/cert-crypto.c: In function ‘cert_pkcs12_pbkdf’:
> ell/cert-crypto.c:244:3: error: ‘bmpstring’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
>    244 |   explicit_bzero(bmpstring, passwd_len);
>        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ---
>   ell/cert-crypto.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> 

Applied, thanks.

Regards,
-Denis

Re: [PATCH v2] cert: Fix warning of possible uninitialized var

[Gix, Brian]

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

Sorry Denis....   In a conf call with Marcel, he suggested the patch in v3 just sent...


Also, if possible, we would like to get a 0.37 version of ELL labeled, since this will be the first working
version for us since 0.35, and I need to account for the file name change of pkcs5 --> cert-crypto


On Mon, 2021-01-25 at 10:34 -0600, Denis Kenzior wrote:
> Hi Brian,
> 
> On 1/18/21 12:20 PM, Brian Gix wrote:
> > ell/cert-crypto.c: In function ‘cert_pkcs12_pbkdf’:
> > ell/cert-crypto.c:244:3: error: ‘bmpstring’ may be used uninitialized in this function [-Werror=maybe-
> > uninitialized]
> >    244 |   explicit_bzero(bmpstring, passwd_len);
> >        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > ---
> >   ell/cert-crypto.c | 10 ++++++----
> >   1 file changed, 6 insertions(+), 4 deletions(-)
> > 
> 
> Applied, thanks.
> 
> Regards,
> -Denis
>