From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 8 Jul 2010 16:51:48 +0000 (+0000)
Subject: initialise pbe_tmp
X-Git-Tag: OpenSSL_0_9_8p~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65b4c34d86c9c3b7a68b5c6cd325ccc887e9829b;p=oweals%2Fopenssl.git

initialise pbe_tmp
---

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 278f4858c4..766ea42b5a 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -116,7 +116,7 @@ static int pbe_cmp(const char * const *a, const char * const *b)
 int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
 	     EVP_PBE_KEYGEN *keygen)
 {
-	EVP_PBE_CTL *pbe_tmp, pbelu;
+	EVP_PBE_CTL *pbe_tmp = NULL, pbelu;
 	int i;
 	if (!pbe_algs)
 		{
@@ -141,8 +141,6 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
 				&& pbe_tmp->keygen == keygen)
 				return 1;
 			}
-		else
-			pbe_tmp = NULL;
 		}
 
 	if (!pbe_tmp)