summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/crypto/evp/digest.c
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2016-05-03 23:48:46 +0900
committerShigeki Ohtsu <ohtsu@iij.ad.jp>2016-05-04 12:08:44 +0900
commit59c8e4686b3c31ce6ff4deee5c3cfa7d59072bc8 (patch)
tree287e5be2106da73b4c3763bf3ab776b65c630c6e /deps/openssl/openssl/crypto/evp/digest.c
parent96198d5bc710a4e3ca49eeeb3b3fa7b8cb61547d (diff)
downloadandroid-node-v8-59c8e4686b3c31ce6ff4deee5c3cfa7d59072bc8.tar.gz
android-node-v8-59c8e4686b3c31ce6ff4deee5c3cfa7d59072bc8.tar.bz2
android-node-v8-59c8e4686b3c31ce6ff4deee5c3cfa7d59072bc8.zip
deps: upgrade openssl sources to 1.0.2h
This replaces all sources of openssl-1.0.2h.tar.gz into deps/openssl/openssl Fixes: https://github.com/nodejs/node/issues/6458 PR-URL: https://github.com/nodejs/node/pull/6550 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/crypto/evp/digest.c')
-rw-r--r--deps/openssl/openssl/crypto/evp/digest.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/evp/digest.c b/deps/openssl/openssl/crypto/evp/digest.c
index f2643f3248..5b642b23fc 100644
--- a/deps/openssl/openssl/crypto/evp/digest.c
+++ b/deps/openssl/openssl/crypto/evp/digest.c
@@ -212,8 +212,10 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl)
}
#endif
if (ctx->digest != type) {
- if (ctx->digest && ctx->digest->ctx_size)
+ if (ctx->digest && ctx->digest->ctx_size) {
OPENSSL_free(ctx->md_data);
+ ctx->md_data = NULL;
+ }
ctx->digest = type;
if (!(ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) && type->ctx_size) {
ctx->update = type->update;