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

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  2b80d00e3ac652377ace84c51b53f51a1b7e1ba2 (commit)
      from  78a140ecb3e443b52b644297e7509e5254ae0933 (commit)


- Log -----------------------------------------------------------------
commit 2b80d00e3ac652377ace84c51b53f51a1b7e1ba2
Author: Billy Brumley <bbrumley at gmail.com>
Date:   Thu Jan 21 14:06:57 2016 +0200

    RT3863 ECC: Add missing NULL check. Set a flag
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit dd67493c344d9d98413d2ee7fd2b6fa9411d975c)

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

Summary of changes:
 crypto/ec/ec2_smpl.c | 1 +
 crypto/ec/ec_key.c   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 077c7fc..5b27b91 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -746,6 +746,7 @@ int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
         goto err;
     if (!BN_one(&point->Z))
         goto err;
+    point->Z_is_one = 1;
 
     ret = 1;
 
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index c784b6f..bc94ab5 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -387,6 +387,8 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
 
     tx = BN_CTX_get(ctx);
     ty = BN_CTX_get(ctx);
+    if (ty == NULL)
+        goto err;
 
 #ifndef OPENSSL_NO_EC2M
     tmp_nid = EC_METHOD_get_field_type(EC_GROUP_method_of(key->group));