openssl-engine-0.9.6 merge

1 files changed, 3 insertions, 0 deletions

diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index e3dae52d4d..6bfa2c5acb 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -125,6 +125,9 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         salt = pbe->salt->data;
         saltlen = pbe->salt->length;
 
+        if(!pass) passlen = 0;
+        else if(passlen == -1) passlen = strlen(pass);
+
         EVP_DigestInit (&ctx, md);
         EVP_DigestUpdate (&ctx, pass, passlen);
         EVP_DigestUpdate (&ctx, salt, saltlen);