1 files changed, 25 insertions, 16 deletions

diff --git a/src/lib/libcrypto/bn/bn_x931p.c b/src/lib/libcrypto/bn/bn_x931p.c
index fc8d4c3c49..89c86c1ff7 100644
--- a/src/lib/libcrypto/bn/bn_x931p.c
+++ b/src/lib/libcrypto/bn/bn_x931p.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_x931p.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bn_x931p.c,v 1.6 2015/02/09 15:49:22 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2005.
  */
@@ -107,17 +107,21 @@ BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, const BIGNUM *Xp,
                 return 0;
 
         BN_CTX_start(ctx);
-        if (!p1)
-                p1 = BN_CTX_get(ctx);
-
-        if (!p2)
-                p2 = BN_CTX_get(ctx);
-
-        t = BN_CTX_get(ctx);
-
-        p1p2 = BN_CTX_get(ctx);
+        if (p1 != NULL) {
+                if ((p1 = BN_CTX_get(ctx)) == NULL)
+                        goto err;
+        }
+        if (p2 != NULL) {
+                if ((p2 = BN_CTX_get(ctx)) == NULL)
+                        goto err;
+        }
 
-        pm1 = BN_CTX_get(ctx);
+        if ((t = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((p1p2 = BN_CTX_get(ctx)) == NULL)
+                goto err;
+        if ((pm1 = BN_CTX_get(ctx)) == NULL)
+                goto err;
 
         if (!bn_x931_derive_pi(p1, Xp1, ctx, cb))
                 goto err;
@@ -213,7 +217,8 @@ BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
                 return 0;
 
         BN_CTX_start(ctx);
-        t = BN_CTX_get(ctx);
+        if ((t = BN_CTX_get(ctx)) == NULL)
+                return 0;
 
         for (i = 0; i < 1000; i++) {
                 if (!BN_rand(Xq, nbits, 1, 0))
@@ -247,10 +252,14 @@ BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, BIGNUM *Xp1,
         int ret = 0;
 
         BN_CTX_start(ctx);
-        if (!Xp1)
-                Xp1 = BN_CTX_get(ctx);
-        if (!Xp2)
-                Xp2 = BN_CTX_get(ctx);
+        if (Xp1 != NULL) {
+                if ((Xp1 = BN_CTX_get(ctx)) == NULL)
+                        goto error;
+        }
+        if (Xp2 != NULL) {
+                if ((Xp2 = BN_CTX_get(ctx)) == NULL)
+                        goto error;
+        }
 
         if (!BN_rand(Xp1, 101, 0, 0))
                 goto error;