From cfae32c69a0dde5a47fbd5aed4103fb01fc59acf Mon Sep 17 00:00:00 2001 From: Nicola Tuveri Date: Tue, 21 Jul 2020 23:12:59 +0300 Subject: [PATCH] [test][ectest] Minor touches to custom_generator_test Minor changes to `custom_generator_test`: - this is to align to the 1.1.1 version of the test (simplify the code as there is no need to use `EC_GROUP_get_field_type()`) - add comment to explain how the buffer size is computed Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12507) --- test/ectest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/ectest.c b/test/ectest.c index 66da1b9e05..3678c42f71 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -2364,10 +2364,8 @@ static int custom_generator_test(int id) goto err; /* expected byte length of encoded points */ - bsize = (EC_GROUP_get_field_type(group) == NID_X9_62_prime_field) ? - BN_num_bytes(EC_GROUP_get0_field(group)) : - (EC_GROUP_get_degree(group) + 7) / 8; - bsize = 2 * bsize + 1; + bsize = (EC_GROUP_get_degree(group) + 7) / 8; + bsize = 1 + 2 * bsize; /* UNCOMPRESSED_POINT format */ if (!TEST_ptr(k = BN_CTX_get(ctx)) /* fetch a testing scalar k != 0,1 */ -- GitLab