summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/crypto/dh/dh_check.c
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2016-03-01 14:03:58 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2016-03-01 18:29:20 +0100
commit32719950df8e792684a49b89fe03a00bf65c7010 (patch)
tree04a2aca536b988902c4dae21d7d5d9c956b26d59 /deps/openssl/openssl/crypto/dh/dh_check.c
parenta7e49c886f5cb8c351673f413dc66086ff1d75bc (diff)
downloadandroid-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.tar.gz
android-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.tar.bz2
android-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.zip
deps: upgrade openssl to 1.0.2g
PR-URL: https://github.com/nodejs/node/pull/5507 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/openssl/openssl/crypto/dh/dh_check.c')
-rw-r--r--deps/openssl/openssl/crypto/dh/dh_check.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/deps/openssl/openssl/crypto/dh/dh_check.c b/deps/openssl/openssl/crypto/dh/dh_check.c
index 5adedc0d26..0277041114 100644
--- a/deps/openssl/openssl/crypto/dh/dh_check.c
+++ b/deps/openssl/openssl/crypto/dh/dh_check.c
@@ -160,13 +160,12 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
goto err;
BN_CTX_start(ctx);
tmp = BN_CTX_get(ctx);
- if (tmp == NULL)
+ if (tmp == NULL || !BN_set_word(tmp, 1))
goto err;
- BN_set_word(tmp, 1);
if (BN_cmp(pub_key, tmp) <= 0)
*ret |= DH_CHECK_PUBKEY_TOO_SMALL;
- BN_copy(tmp, dh->p);
- BN_sub_word(tmp, 1);
+ if (BN_copy(tmp, dh->p) == NULL || !BN_sub_word(tmp, 1))
+ goto err;
if (BN_cmp(pub_key, tmp) >= 0)
*ret |= DH_CHECK_PUBKEY_TOO_LARGE;