From: Matt Caswell <matt@openssl.org>
Date: Fri, 29 Jan 2016 09:40:03 +0000 (+0000)
Subject: Add missing return value checks
X-Git-Tag: OpenSSL_1_0_2g~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83ab6e55a1f8de9b3e45d13dcc78eb739dc66dea;p=oweals%2Fopenssl.git

Add missing return value checks

The function DH_check_pub_key() was missing some return value checks in
some calls to BN functions.

RT#4278

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit f5a12207eccfd814bde68b880a96910dfa25f164)
---

diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index 5adedc0d26..0277041114 100644
--- a/crypto/dh/dh_check.c
+++ b/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;