diff options
| author | Nicola Tuveri <[email protected]> | 2019-09-12 00:57:47 +0200 |
|---|---|---|
| committer | Nicola Tuveri <[email protected]> | 2019-09-12 01:08:27 +0200 |
| commit | a3b54f0f5de1ad17889fd23aee7c230eefc300cd (patch) | |
| tree | 4d23d5306e9a7b61ded6ac475c07bcec9d96a865 | |
| parent | Prepare for 1.1.0m-dev (diff) | |
| download | openssl-OpenSSL_1_1_0-stable.tar.gz openssl-OpenSSL_1_1_0-stable.zip | |
Fix no-ec2m in ec_curve.c (1.1.0)OpenSSL_1_1_0-stable
I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and
inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this
fixes it.
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/9873)
| -rw-r--r-- | crypto/ec/ec_curve.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c index 2d28d7f70bb..6a58b3a23e0 100644 --- a/crypto/ec/ec_curve.c +++ b/crypto/ec/ec_curve.c @@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group, #ifndef OPENSSL_NO_EC2M if (field_nid == NID_X9_62_characteristic_two_field) { - return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); + return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); } else #endif /* !def(OPENSSL_NO_EC2M) */ if (field_nid == NID_X9_62_prime_field) { - return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx); + return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx); } else { /* this should never happen */ return 0; |