diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libcrypto/ec/ectest.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/regress/lib/libcrypto/ec/ectest.c b/src/regress/lib/libcrypto/ec/ectest.c index 710bebe483..c4ef840ff2 100644 --- a/src/regress/lib/libcrypto/ec/ectest.c +++ b/src/regress/lib/libcrypto/ec/ectest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ectest.c,v 1.11 2021/04/20 17:30:32 tb Exp $ */ | 1 | /* $OpenBSD: ectest.c,v 1.12 2021/04/20 17:35:21 tb Exp $ */ |
2 | /* crypto/ec/ectest.c */ | 2 | /* crypto/ec/ectest.c */ |
3 | /* | 3 | /* |
4 | * Originally written by Bodo Moeller for the OpenSSL project. | 4 | * Originally written by Bodo Moeller for the OpenSSL project. |
@@ -248,7 +248,7 @@ prime_field_tests(void) | |||
248 | 248 | ||
249 | if (!BN_hex2bn(&x, "D")) | 249 | if (!BN_hex2bn(&x, "D")) |
250 | ABORT; | 250 | ABORT; |
251 | if (!EC_POINT_set_compressed_coordinates_GFp(group, Q, x, 1, ctx)) | 251 | if (!EC_POINT_set_compressed_coordinates(group, Q, x, 1, ctx)) |
252 | ABORT; | 252 | ABORT; |
253 | if (!EC_POINT_is_on_curve(group, Q, ctx)) { | 253 | if (!EC_POINT_is_on_curve(group, Q, ctx)) { |
254 | if (!EC_POINT_get_affine_coordinates(group, Q, x, y, ctx)) | 254 | if (!EC_POINT_get_affine_coordinates(group, Q, x, y, ctx)) |
@@ -420,7 +420,7 @@ prime_field_tests(void) | |||
420 | 420 | ||
421 | if (!BN_hex2bn(&x, "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012")) | 421 | if (!BN_hex2bn(&x, "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012")) |
422 | ABORT; | 422 | ABORT; |
423 | if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx)) | 423 | if (!EC_POINT_set_compressed_coordinates(group, P, x, 1, ctx)) |
424 | ABORT; | 424 | ABORT; |
425 | if (!EC_POINT_is_on_curve(group, P, ctx)) | 425 | if (!EC_POINT_is_on_curve(group, P, ctx)) |
426 | ABORT; | 426 | ABORT; |
@@ -470,7 +470,7 @@ prime_field_tests(void) | |||
470 | 470 | ||
471 | if (!BN_hex2bn(&x, "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21")) | 471 | if (!BN_hex2bn(&x, "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21")) |
472 | ABORT; | 472 | ABORT; |
473 | if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 0, ctx)) | 473 | if (!EC_POINT_set_compressed_coordinates(group, P, x, 0, ctx)) |
474 | ABORT; | 474 | ABORT; |
475 | if (!EC_POINT_is_on_curve(group, P, ctx)) | 475 | if (!EC_POINT_is_on_curve(group, P, ctx)) |
476 | ABORT; | 476 | ABORT; |
@@ -520,7 +520,7 @@ prime_field_tests(void) | |||
520 | 520 | ||
521 | if (!BN_hex2bn(&x, "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296")) | 521 | if (!BN_hex2bn(&x, "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296")) |
522 | ABORT; | 522 | ABORT; |
523 | if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx)) | 523 | if (!EC_POINT_set_compressed_coordinates(group, P, x, 1, ctx)) |
524 | ABORT; | 524 | ABORT; |
525 | if (!EC_POINT_is_on_curve(group, P, ctx)) | 525 | if (!EC_POINT_is_on_curve(group, P, ctx)) |
526 | ABORT; | 526 | ABORT; |
@@ -570,7 +570,7 @@ prime_field_tests(void) | |||
570 | 570 | ||
571 | if (!BN_hex2bn(&x, "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B" | 571 | if (!BN_hex2bn(&x, "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B" |
572 | "9859F741E082542A385502F25DBF55296C3A545E3872760AB7")) ABORT; | 572 | "9859F741E082542A385502F25DBF55296C3A545E3872760AB7")) ABORT; |
573 | if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 1, ctx)) | 573 | if (!EC_POINT_set_compressed_coordinates(group, P, x, 1, ctx)) |
574 | ABORT; | 574 | ABORT; |
575 | if (!EC_POINT_is_on_curve(group, P, ctx)) | 575 | if (!EC_POINT_is_on_curve(group, P, ctx)) |
576 | ABORT; | 576 | ABORT; |
@@ -624,7 +624,7 @@ prime_field_tests(void) | |||
624 | if (!BN_hex2bn(&x, "C6858E06B70404E9CD9E3ECB662395B4429C648139053F" | 624 | if (!BN_hex2bn(&x, "C6858E06B70404E9CD9E3ECB662395B4429C648139053F" |
625 | "B521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B" | 625 | "B521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B" |
626 | "3C1856A429BF97E7E31C2E5BD66")) ABORT; | 626 | "3C1856A429BF97E7E31C2E5BD66")) ABORT; |
627 | if (!EC_POINT_set_compressed_coordinates_GFp(group, P, x, 0, ctx)) | 627 | if (!EC_POINT_set_compressed_coordinates(group, P, x, 0, ctx)) |
628 | ABORT; | 628 | ABORT; |
629 | if (!EC_POINT_is_on_curve(group, P, ctx)) | 629 | if (!EC_POINT_is_on_curve(group, P, ctx)) |
630 | ABORT; | 630 | ABORT; |
@@ -718,7 +718,7 @@ prime_field_tests(void) | |||
718 | #ifdef OPENSSL_EC_BIN_PT_COMP | 718 | #ifdef OPENSSL_EC_BIN_PT_COMP |
719 | #define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \ | 719 | #define CHAR2_CURVE_TEST_INTERNAL(_name, _p, _a, _b, _x, _y, _y_bit, _order, _cof, _degree, _variable) \ |
720 | if (!BN_hex2bn(&x, _x)) ABORT; \ | 720 | if (!BN_hex2bn(&x, _x)) ABORT; \ |
721 | if (!EC_POINT_set_compressed_coordinates_GF2m(group, P, x, _y_bit, ctx)) ABORT; \ | 721 | if (!EC_POINT_set_compressed_coordinates(group, P, x, _y_bit, ctx)) ABORT; \ |
722 | if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \ | 722 | if (!EC_POINT_is_on_curve(group, P, ctx)) ABORT; \ |
723 | if (!BN_hex2bn(&z, _order)) ABORT; \ | 723 | if (!BN_hex2bn(&z, _order)) ABORT; \ |
724 | if (!BN_hex2bn(&cof, _cof)) ABORT; \ | 724 | if (!BN_hex2bn(&cof, _cof)) ABORT; \ |
@@ -855,7 +855,7 @@ prime_field_tests(void) | |||
855 | ABORT; | 855 | ABORT; |
856 | /* Change test based on whether binary point compression is enabled or not. */ | 856 | /* Change test based on whether binary point compression is enabled or not. */ |
857 | #ifdef OPENSSL_EC_BIN_PT_COMP | 857 | #ifdef OPENSSL_EC_BIN_PT_COMP |
858 | if (!EC_POINT_set_compressed_coordinates_GF2m(group, Q, x, 1, ctx)) | 858 | if (!EC_POINT_set_compressed_coordinates(group, Q, x, 1, ctx)) |
859 | ABORT; | 859 | ABORT; |
860 | #else | 860 | #else |
861 | if (!BN_hex2bn(&y, "8")) | 861 | if (!BN_hex2bn(&y, "8")) |