diff options
author | tb <> | 2021-04-20 17:16:38 +0000 |
---|---|---|
committer | tb <> | 2021-04-20 17:16:38 +0000 |
commit | 67e97261c2453d56f2a373d1f3023d6538995dd5 (patch) | |
tree | 5887c8db20a9739a2d144ce6d009f6f18b6f49f1 /src/lib/libcrypto/ec/ecp_oct.c | |
parent | 3b87dc9794809a607c59f25dd5d25a8dd1b9e453 (diff) | |
download | openbsd-67e97261c2453d56f2a373d1f3023d6538995dd5.tar.gz openbsd-67e97261c2453d56f2a373d1f3023d6538995dd5.tar.bz2 openbsd-67e97261c2453d56f2a373d1f3023d6538995dd5.zip |
Prepare to provide EC_POINT_{g,s}et_affine_coordinates
Similar to part of OpenSSL commit 8e3cced75fb5fee5da59ebef9605d403a999391b
ok jsing
Diffstat (limited to 'src/lib/libcrypto/ec/ecp_oct.c')
-rw-r--r-- | src/lib/libcrypto/ec/ecp_oct.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/ec/ecp_oct.c b/src/lib/libcrypto/ec/ecp_oct.c index 29d9990546..901220483c 100644 --- a/src/lib/libcrypto/ec/ecp_oct.c +++ b/src/lib/libcrypto/ec/ecp_oct.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecp_oct.c,v 1.12 2020/12/04 08:55:30 tb Exp $ */ | 1 | /* $OpenBSD: ecp_oct.c,v 1.13 2021/04/20 17:16:38 tb Exp $ */ |
2 | /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> | 2 | /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> |
3 | * for the OpenSSL project. | 3 | * for the OpenSSL project. |
4 | * Includes code written by Bodo Moeller for the OpenSSL project. | 4 | * Includes code written by Bodo Moeller for the OpenSSL project. |
@@ -185,7 +185,7 @@ ec_GFp_simple_set_compressed_coordinates(const EC_GROUP * group, | |||
185 | ECerror(ERR_R_INTERNAL_ERROR); | 185 | ECerror(ERR_R_INTERNAL_ERROR); |
186 | goto err; | 186 | goto err; |
187 | } | 187 | } |
188 | if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) | 188 | if (!EC_POINT_set_affine_coordinates(group, point, x, y, ctx)) |
189 | goto err; | 189 | goto err; |
190 | 190 | ||
191 | ret = 1; | 191 | ret = 1; |
@@ -246,7 +246,7 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co | |||
246 | if ((y = BN_CTX_get(ctx)) == NULL) | 246 | if ((y = BN_CTX_get(ctx)) == NULL) |
247 | goto err; | 247 | goto err; |
248 | 248 | ||
249 | if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) | 249 | if (!EC_POINT_get_affine_coordinates(group, point, x, y, ctx)) |
250 | goto err; | 250 | goto err; |
251 | 251 | ||
252 | if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y)) | 252 | if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y)) |
@@ -382,10 +382,10 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point, | |||
382 | } | 382 | } |
383 | } | 383 | } |
384 | /* | 384 | /* |
385 | * EC_POINT_set_affine_coordinates_GFp checks that the point is | 385 | * EC_POINT_set_affine_coordinates checks that the point is |
386 | * on the curve as required by X9.62. | 386 | * on the curve as required by X9.62. |
387 | */ | 387 | */ |
388 | if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) | 388 | if (!EC_POINT_set_affine_coordinates(group, point, x, y, ctx)) |
389 | goto err; | 389 | goto err; |
390 | } | 390 | } |
391 | 391 | ||