openssl-engine-0.9.6 merge

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index 27a2c518be..717fad68ca 100644
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ b/src/lib/libcrypto/evp/p5_crpt2.c
@@ -86,7 +86,8 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
         HMAC_CTX hctx;
         p = out;
         tkeylen = keylen;
-        if(passlen == -1) passlen = strlen(pass);
+        if(!pass) passlen = 0;
+        else if(passlen == -1) passlen = strlen(pass);
         while(tkeylen) {
                 if(tkeylen > SHA_DIGEST_LENGTH) cplen = SHA_DIGEST_LENGTH;
                 else cplen = tkeylen;