RT3863 ECC: Add missing NULL check. Set a flag
authorBilly Brumley <bbrumley@gmail.com>
Thu, 21 Jan 2016 12:06:57 +0000 (14:06 +0200)
committerBilly Brumley <bbrumley@gmail.com>
Thu, 21 Jan 2016 12:06:57 +0000 (14:06 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
crypto/ec/ec2_smpl.c
crypto/ec/ec_key.c

index 66bff0d..6d6be30 100644 (file)
@@ -742,6 +742,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;
 
index f236e3c..2469edc 100644 (file)
@@ -384,6 +384,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));