Skip to content

Commit

Permalink
Merge pull request #7907 from gowthamsk-arm/fix_ecp_group_compare
Browse files Browse the repository at this point in the history
tests/test_suite_ecp: Fix ECP group compare test
  • Loading branch information
gilles-peskine-arm authored Jul 13, 2023
2 parents 76a54ff + 21f2b7a commit 4e73afe
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions tests/suites/test_suite_ecp.function
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,11 @@ inline static int mbedtls_ecp_group_cmp(mbedtls_ecp_group *grp1,
if (grp1->t_data != grp2->t_data) {
return 1;
}
if (grp1->T_size != grp2->T_size) {
return 1;
}
if (grp1->T != grp2->T) {
return 1;
}
/* Here we should not compare T and T_size as the value of T is
* always NULL for Montgomery curves and for Weierstrass curves
* it will be NULL until ecp_mul is called. After calling ecp_mul,
* the value will be unique (dynamically allocated).
*/

return 0;
}
Expand Down Expand Up @@ -1207,6 +1206,8 @@ void mbedtls_ecp_group_metadata(int id, int bit_size, int crv_type,

// Copy group and compare with original
TEST_EQUAL(mbedtls_ecp_group_copy(&grp_cpy, &grp), 0);
TEST_ASSERT(grp_cpy.T == NULL);
TEST_ASSERT(grp_cpy.T_size == 0);
TEST_EQUAL(mbedtls_ecp_group_cmp(&grp, &grp_cpy), 0);

// Check curve is in curve list and group ID list
Expand Down

0 comments on commit 4e73afe

Please sign in to comment.