@@ -6661,7 +6661,7 @@ static void test_sort_helper(secp256k1_pubkey *pk, size_t *pk_order, size_t n_pk
6661
6661
for (i = 0 ; i < n_pk ; i ++ ) {
6662
6662
pk_test [i ] = & pk [pk_order [i ]];
6663
6663
}
6664
- secp256k1_pubkey_sort (CTX , pk_test , n_pk );
6664
+ secp256k1_ec_pubkey_sort (CTX , pk_test , n_pk );
6665
6665
for (i = 0 ; i < n_pk ; i ++ ) {
6666
6666
CHECK (secp256k1_memcmp_var (pk_test [i ], & pk [i ], sizeof (* pk_test [i ])) == 0 );
6667
6667
}
@@ -6696,17 +6696,17 @@ static void test_sort_api(void) {
6696
6696
rand_pk (& pks [0 ]);
6697
6697
rand_pk (& pks [1 ]);
6698
6698
6699
- CHECK (secp256k1_pubkey_sort (CTX , pks_ptr , 2 ) == 1 );
6700
- CHECK_ILLEGAL (CTX , secp256k1_pubkey_sort (CTX , NULL , 2 ));
6701
- CHECK (secp256k1_pubkey_sort (CTX , pks_ptr , 0 ) == 1 );
6699
+ CHECK (secp256k1_ec_pubkey_sort (CTX , pks_ptr , 2 ) == 1 );
6700
+ CHECK_ILLEGAL (CTX , secp256k1_ec_pubkey_sort (CTX , NULL , 2 ));
6701
+ CHECK (secp256k1_ec_pubkey_sort (CTX , pks_ptr , 0 ) == 1 );
6702
6702
/* Test illegal public keys */
6703
6703
memset (& pks [0 ], 0 , sizeof (pks [0 ]));
6704
- CHECK_ILLEGAL_VOID (CTX , CHECK (secp256k1_pubkey_sort (CTX , pks_ptr , 2 ) == 1 ));
6704
+ CHECK_ILLEGAL_VOID (CTX , CHECK (secp256k1_ec_pubkey_sort (CTX , pks_ptr , 2 ) == 1 ));
6705
6705
memset (& pks [1 ], 0 , sizeof (pks [1 ]));
6706
6706
{
6707
6707
int32_t ecount = 0 ;
6708
6708
secp256k1_context_set_illegal_callback (CTX , counting_callback_fn , & ecount );
6709
- CHECK (secp256k1_pubkey_sort (CTX , pks_ptr , 2 ) == 1 );
6709
+ CHECK (secp256k1_ec_pubkey_sort (CTX , pks_ptr , 2 ) == 1 );
6710
6710
CHECK (ecount == 2 );
6711
6711
secp256k1_context_set_illegal_callback (CTX , NULL , NULL );
6712
6712
}
@@ -6750,9 +6750,9 @@ static void test_sort(void) {
6750
6750
rand_pk (& pk [j ]);
6751
6751
pk_ptr [j ] = & pk [j ];
6752
6752
}
6753
- secp256k1_pubkey_sort (CTX , pk_ptr , 5 );
6753
+ secp256k1_ec_pubkey_sort (CTX , pk_ptr , 5 );
6754
6754
for (j = 1 ; j < 5 ; j ++ ) {
6755
- CHECK (secp256k1_pubkey_sort_cmp (& pk_ptr [j - 1 ], & pk_ptr [j ], CTX ) <= 0 );
6755
+ CHECK (secp256k1_ec_pubkey_sort_cmp (& pk_ptr [j - 1 ], & pk_ptr [j ], CTX ) <= 0 );
6756
6756
}
6757
6757
}
6758
6758
}
@@ -6796,7 +6796,7 @@ static void test_sort_vectors(void) {
6796
6796
CHECK (secp256k1_ec_pubkey_parse (CTX , & pubkeys [i ], pk_ser [i ], sizeof (pk_ser [i ])));
6797
6797
pks_ptr [i ] = & pubkeys [i ];
6798
6798
}
6799
- CHECK (secp256k1_pubkey_sort (CTX , pks_ptr , N_PUBKEYS ) == 1 );
6799
+ CHECK (secp256k1_ec_pubkey_sort (CTX , pks_ptr , N_PUBKEYS ) == 1 );
6800
6800
for (i = 0 ; i < N_PUBKEYS ; i ++ ) {
6801
6801
CHECK (secp256k1_memcmp_var (pks_ptr [i ], sorted [i ], sizeof (secp256k1_pubkey )) == 0 );
6802
6802
}
0 commit comments