Merge commits '4392f0f7 ' into temp-merge-1533
This commit is contained in:
@@ -54,7 +54,7 @@ static void test_whitelist_end_to_end(const size_t n_keys, int test_all_keys) {
|
||||
/* Generate random keys */
|
||||
size_t i;
|
||||
/* Start with subkey */
|
||||
random_scalar_order_test(&ssub);
|
||||
testutil_random_scalar_order_test(&ssub);
|
||||
secp256k1_scalar_get_b32(csub, &ssub);
|
||||
CHECK(secp256k1_ec_seckey_verify(CTX, csub) == 1);
|
||||
CHECK(secp256k1_ec_pubkey_create(CTX, &sub_pubkey, csub) == 1);
|
||||
@@ -66,12 +66,12 @@ static void test_whitelist_end_to_end(const size_t n_keys, int test_all_keys) {
|
||||
summed_seckey[i] = (unsigned char *) malloc(32);
|
||||
|
||||
/* Create two keys */
|
||||
random_scalar_order_test(&son);
|
||||
testutil_random_scalar_order_test(&son);
|
||||
secp256k1_scalar_get_b32(online_seckey[i], &son);
|
||||
CHECK(secp256k1_ec_seckey_verify(CTX, online_seckey[i]) == 1);
|
||||
CHECK(secp256k1_ec_pubkey_create(CTX, &online_pubkeys[i], online_seckey[i]) == 1);
|
||||
|
||||
random_scalar_order_test(&soff);
|
||||
testutil_random_scalar_order_test(&soff);
|
||||
secp256k1_scalar_get_b32(summed_seckey[i], &soff);
|
||||
CHECK(secp256k1_ec_seckey_verify(CTX, summed_seckey[i]) == 1);
|
||||
CHECK(secp256k1_ec_pubkey_create(CTX, &offline_pubkeys[i], summed_seckey[i]) == 1);
|
||||
@@ -88,7 +88,7 @@ static void test_whitelist_end_to_end(const size_t n_keys, int test_all_keys) {
|
||||
test_whitelist_end_to_end_internal(summed_seckey[i], online_seckey[i], online_pubkeys, offline_pubkeys, &sub_pubkey, i, n_keys);
|
||||
}
|
||||
} else {
|
||||
uint32_t rand_idx = secp256k1_testrand_int(n_keys-1);
|
||||
uint32_t rand_idx = testrand_int(n_keys-1);
|
||||
test_whitelist_end_to_end_internal(summed_seckey[0], online_seckey[0], online_pubkeys, offline_pubkeys, &sub_pubkey, 0, n_keys);
|
||||
test_whitelist_end_to_end_internal(summed_seckey[rand_idx], online_seckey[rand_idx], online_pubkeys, offline_pubkeys, &sub_pubkey, rand_idx, n_keys);
|
||||
test_whitelist_end_to_end_internal(summed_seckey[n_keys-1], online_seckey[n_keys-1], online_pubkeys, offline_pubkeys, &sub_pubkey, n_keys-1, n_keys);
|
||||
|
||||
Reference in New Issue
Block a user