From 2b80d00e3ac652377ace84c51b53f51a1b7e1ba2 Mon Sep 17 00:00:00 2001 From: Billy Brumley Date: Thu, 21 Jan 2016 14:06:57 +0200 Subject: RT3863 ECC: Add missing NULL check. Set a flag Reviewed-by: Rich Salz Reviewed-by: Matt Caswell (cherry picked from commit dd67493c344d9d98413d2ee7fd2b6fa9411d975c) --- crypto/ec/ec2_smpl.c | 1 + crypto/ec/ec_key.c | 2 ++ 2 files changed, 3 insertions(+) (limited to 'crypto/ec') diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index 077c7fc8dd..5b27b91fcc 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 c784b6fd30..bc94ab5661 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)); -- cgit v1.2.3