[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_2-stable has been updated
       via  48bacd31e88421fa413f0a62ef8e0285e3dbd402 (commit)
      from  a6eec3574e220fe83b95be048106ed3add80942a (commit)


- Log -----------------------------------------------------------------
commit 48bacd31e88421fa413f0a62ef8e0285e3dbd402
Author: Steven Valdez <svaldez at google.com>
Date:   Tue Mar 1 13:20:43 2016 -0500

    Adding missing BN_CTX_(start/end) in crypto/ec/ec_key.c
    
    RT#4363
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>
    (cherry picked from commit 2ab851b779a77d119e1677b2495b368a46d83eef)
    
    Conflicts:
    	crypto/ec/ec_key.c

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ec_key.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index bc94ab5..456080e 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -377,9 +377,9 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
         return 0;
     }
     ctx = BN_CTX_new();
-    if (!ctx)
-        goto err;
-
+    if (ctx == NULL)
+        return 0;
+    BN_CTX_start(ctx);
     point = EC_POINT_new(key->group);
 
     if (!point)
@@ -432,10 +432,9 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
     ok = 1;
 
  err:
-    if (ctx)
-        BN_CTX_free(ctx);
-    if (point)
-        EC_POINT_free(point);
+    BN_CTX_end(ctx);
+    BN_CTX_free(ctx);
+    EC_POINT_free(point);
     return ok;
 
 }