1 files changed, 19 insertions, 16 deletions

diff --git a/src/lib/libcrypto/bn/bn_gf2m.c b/src/lib/libcrypto/bn/bn_gf2m.c
index 1cd38c7797..4544369248 100644
--- a/src/lib/libcrypto/bn/bn_gf2m.c
+++ b/src/lib/libcrypto/bn/bn_gf2m.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_gf2m.c,v 1.16 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: bn_gf2m.c,v 1.17 2015/02/09 15:49:22 jsing Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -840,8 +840,7 @@ BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p,
         bn_check_top(p);
 
         BN_CTX_start(ctx);
-        xinv = BN_CTX_get(ctx);
-        if (xinv == NULL)
+        if ((xinv = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
         if (!BN_GF2m_mod_inv(xinv, x, p, ctx))
@@ -875,11 +874,13 @@ BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p,
 
         BN_CTX_start(ctx);
 
-        a = BN_CTX_get(ctx);
-        b = BN_CTX_get(ctx);
-        u = BN_CTX_get(ctx);
-        v = BN_CTX_get(ctx);
-        if (v == NULL)
+        if ((a = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((b = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((u = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((v = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
         /* reduce x and y mod p */
@@ -1137,10 +1138,11 @@ BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
         }
 
         BN_CTX_start(ctx);
-        a = BN_CTX_get(ctx);
-        z = BN_CTX_get(ctx);
-        w = BN_CTX_get(ctx);
-        if (w == NULL)
+        if ((a = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((z = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((w = BN_CTX_get(ctx)) == NULL)
                 goto err;
 
         if (!BN_GF2m_mod_arr(a, a_, p))
@@ -1169,10 +1171,11 @@ BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
         }
         else /* m is even */
         {
-                rho = BN_CTX_get(ctx);
-                w2 = BN_CTX_get(ctx);
-                tmp = BN_CTX_get(ctx);
-                if (tmp == NULL)
+                if ((rho = BN_CTX_get(ctx)) == NULL)
+                        goto err;
+                if ((w2 = BN_CTX_get(ctx)) == NULL)
+                        goto err;
+                if ((tmp = BN_CTX_get(ctx)) == NULL)
                         goto err;
                 do {
                         if (!BN_rand(rho, p[0], 0, 0))