projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8486c3
)
initialise pbe_tmp
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 8 Jul 2010 16:51:48 +0000
(16:51 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 8 Jul 2010 16:51:48 +0000
(16:51 +0000)
crypto/evp/evp_pbe.c
patch
|
blob
|
history
diff --git
a/crypto/evp/evp_pbe.c
b/crypto/evp/evp_pbe.c
index 278f4858c4c30499d58b0cf356e54d8d2222dc2e..766ea42b5aacf666618daebb24e1a21034bcae61 100644
(file)
--- 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)