BN_CTX_get() can fail - consistently check its return value.

There are currently cases where the return from each call is checked,
the return from only the last call is checked and cases where it is not
checked at all (including code in bn, ec and engine).

Checking the last return value is valid as once the function fails it will
continue to return NULL. However, in order to be consistent check each
call with the same idiom. This makes it easy to verify.

Note there are still a handful of cases that do not follow the idiom -
these will be handled separately.

ok beck@ doug@

1 files changed, 12 insertions, 11 deletions

diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c
index e5cd315e47..02780d32e6 100644
--- a/src/lib/libcrypto/bn/bn_prime.c
+++ b/src/lib/libcrypto/bn/bn_prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_prime.c,v 1.12 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: bn_prime.c,v 1.13 2015/02/09 15:49:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -170,8 +170,7 @@ BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
         if (ctx == NULL)
                 goto err;
         BN_CTX_start(ctx);
-        t = BN_CTX_get(ctx);
-        if (!t)
+        if ((t = BN_CTX_get(ctx)) == NULL)
                 goto err;
 loop:
         /* make a random number and set the top and bottom bits */
@@ -287,10 +286,11 @@ BN_is_prime_fasttest_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed,
                 A = t;
         } else
                 A = a;
-        A1 = BN_CTX_get(ctx);
-        A1_odd = BN_CTX_get(ctx);
-        check = BN_CTX_get(ctx);
-        if (check == NULL)
+        if ((A1 = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((A1_odd = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((check = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
         /* compute A1 := A - 1 */
@@ -461,10 +461,11 @@ probable_prime_dh_safe(BIGNUM *p, int bits, const BIGNUM *padd,
 
         bits--;
         BN_CTX_start(ctx);
-        t1 = BN_CTX_get(ctx);
-        q = BN_CTX_get(ctx);
-        qadd = BN_CTX_get(ctx);
-        if (qadd == NULL)
+        if ((t1 = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((q = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((qadd = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
         if (!BN_rshift1(qadd, padd))