The branch master has been updated
via dd67493c344d9d98413d2ee7fd2b6fa9411d975c (commit)
from 7fccf05d26ff3831a6d936fe09e733fcffc6901b (commit)
- Log -----------------------------------------------------------------
commit dd67493c344d9d98413d2ee7fd2b6fa9411d975c
Author: Billy Brumley <[email protected]>
Date: Thu Jan 21 14:06:57 2016 +0200
RT3863 ECC: Add missing NULL check. Set a flag
Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
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 66bff0d..6d6be30 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -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;
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index f236e3c..2469edc 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -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));
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
