Skip to content

Commit 3617dfe

Browse files
apoelstraapoelstra
committed
rangeproof: rename create_value and verify_value to create_exact and verify_exact
1 parent f871fc1 commit 3617dfe

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎include/secp256k1_rangeproof.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_rangeproof_info(
288288
) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(5);
289289

290290
/** Verify a rangeproof with a single-value range. Useful as a "proof of value"
291-
* of a Pedersen commitment. Such proofs can be created with `secp256k1_rangeproof_create_value`,
291+
* of a Pedersen commitment. Such proofs can be created with `secp256k1_rangeproof_create_exact`,
292292
* or with `secp256k1_rangeproof_sign` by passing an `exp` parameter of -1 and the
293293
* target value as both `value` and `min_value`. (In this case `min_bits` is ignored
294294
* and may take any value, but for clarity it's best to pass zero.)
@@ -301,7 +301,7 @@ SECP256K1_API SECP256K1_WARN_UNUSED_RESULT int secp256k1_rangeproof_info(
301301
* commit: the Pedersen commitment whose value is being verified
302302
* gen: additional generator 'h'
303303
*/
304-
SECP256K1_API int secp256k1_rangeproof_verify_value(
304+
SECP256K1_API int secp256k1_rangeproof_verify_exact(
305305
const secp256k1_context* ctx,
306306
const unsigned char* proof,
307307
size_t plen,
@@ -322,7 +322,7 @@ SECP256K1_API int secp256k1_rangeproof_verify_value(
322322
* commit: the Pedersen commitment whose value is being proven
323323
* gen: additional generator 'h'
324324
*/
325-
SECP256K1_API int secp256k1_rangeproof_create_value(
325+
SECP256K1_API int secp256k1_rangeproof_create_exact(
326326
const secp256k1_context* ctx,
327327
unsigned char* proof,
328328
size_t* plen,

‎src/modules/rangeproof/main_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ int secp256k1_rangeproof_sign(const secp256k1_context* ctx, unsigned char *proof
304304
proof, plen, min_value, &commitp, blind, nonce, exp, min_bits, value, message, msg_len, extra_commit, extra_commit_len, &genp);
305305
}
306306

307-
int secp256k1_rangeproof_verify_value(const secp256k1_context* ctx, const unsigned char* proof, size_t plen, uint64_t value, const secp256k1_pedersen_commitment* commit, const secp256k1_generator* gen) {
307+
int secp256k1_rangeproof_verify_exact(const secp256k1_context* ctx, const unsigned char* proof, size_t plen, uint64_t value, const secp256k1_pedersen_commitment* commit, const secp256k1_generator* gen) {
308308
secp256k1_ge commitp;
309309
secp256k1_ge genp;
310310
secp256k1_gej tmpj;
@@ -397,7 +397,7 @@ int secp256k1_rangeproof_verify_value(const secp256k1_context* ctx, const unsign
397397
return !secp256k1_memcmp_var(tmpch, &proof[offset], 32);
398398
}
399399

400-
int secp256k1_rangeproof_create_value(const secp256k1_context* ctx, unsigned char* proof, size_t* plen, uint64_t value, const unsigned char* blind, const secp256k1_pedersen_commitment* commit, const secp256k1_generator* gen) {
400+
int secp256k1_rangeproof_create_exact(const secp256k1_context* ctx, unsigned char* proof, size_t* plen, uint64_t value, const unsigned char* blind, const secp256k1_pedersen_commitment* commit, const secp256k1_generator* gen) {
401401
secp256k1_ge commitp;
402402
secp256k1_ge genp;
403403
secp256k1_gej tmpj;

‎src/modules/rangeproof/tests_impl.h

+22-22
Original file line numberDiff line numberDiff line change
@@ -229,43 +229,43 @@ static void test_rangeproof_api(const secp256k1_context *none, const secp256k1_c
229229
{
230230
*ecount = 0;
231231
len = sizeof(proof);
232-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, val, blind, &commit, secp256k1_generator_h) == 1);
233-
CHECK(secp256k1_rangeproof_create_value(none, NULL, &len, val, blind, &commit, secp256k1_generator_h) == 0);
232+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, val, blind, &commit, secp256k1_generator_h) == 1);
233+
CHECK(secp256k1_rangeproof_create_exact(none, NULL, &len, val, blind, &commit, secp256k1_generator_h) == 0);
234234
CHECK(*ecount == 1);
235-
CHECK(secp256k1_rangeproof_create_value(none, proof, NULL, val, blind, &commit, secp256k1_generator_h) == 0);
235+
CHECK(secp256k1_rangeproof_create_exact(none, proof, NULL, val, blind, &commit, secp256k1_generator_h) == 0);
236236
CHECK(*ecount == 2);
237-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, val, NULL, &commit, secp256k1_generator_h) == 0);
237+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, val, NULL, &commit, secp256k1_generator_h) == 0);
238238
CHECK(*ecount == 3);
239-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, val, blind, NULL, secp256k1_generator_h) == 0);
239+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, val, blind, NULL, secp256k1_generator_h) == 0);
240240
CHECK(*ecount == 4);
241-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, val, blind, &commit, NULL) == 0);
241+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, val, blind, &commit, NULL) == 0);
242242
CHECK(*ecount == 5);
243243
len = 0;
244-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 0);
244+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 0);
245245
len = 64;
246-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 0);
246+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 0);
247247
len = 65;
248-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 1);
248+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, 0, blind, &commit, secp256k1_generator_h) == 1);
249249
len = 65;
250-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, 1, blind, &commit, secp256k1_generator_h) == 0);
250+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, 1, blind, &commit, secp256k1_generator_h) == 0);
251251
len = 72;
252-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, 1, blind, &commit, secp256k1_generator_h) == 0);
252+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, 1, blind, &commit, secp256k1_generator_h) == 0);
253253
len = 73;
254-
CHECK(secp256k1_rangeproof_create_value(none, proof, &len, val, blind, &commit, secp256k1_generator_h) == 1);
254+
CHECK(secp256k1_rangeproof_create_exact(none, proof, &len, val, blind, &commit, secp256k1_generator_h) == 1);
255255
CHECK(*ecount == 5);
256256

257257
*ecount = 0;
258-
CHECK(secp256k1_rangeproof_verify_value(none, proof, len, val, &commit, secp256k1_generator_h) == 1);
258+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, len, val, &commit, secp256k1_generator_h) == 1);
259259
CHECK(*ecount == 0);
260-
CHECK(secp256k1_rangeproof_verify_value(none, NULL, len, val, &commit, secp256k1_generator_h) == 0);
260+
CHECK(secp256k1_rangeproof_verify_exact(none, NULL, len, val, &commit, secp256k1_generator_h) == 0);
261261
CHECK(*ecount == 1);
262-
CHECK(secp256k1_rangeproof_verify_value(none, proof, len, val, NULL, secp256k1_generator_h) == 0);
262+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, len, val, NULL, secp256k1_generator_h) == 0);
263263
CHECK(*ecount == 2);
264-
CHECK(secp256k1_rangeproof_verify_value(none, proof, len, val, &commit, NULL) == 0);
264+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, len, val, &commit, NULL) == 0);
265265
CHECK(*ecount == 3);
266-
CHECK(secp256k1_rangeproof_verify_value(none, proof, 0, val, &commit, secp256k1_generator_h) == 0);
267-
CHECK(secp256k1_rangeproof_verify_value(none, proof, len - 1, val, &commit, secp256k1_generator_h) == 0);
268-
CHECK(secp256k1_rangeproof_verify_value(none, proof, len, val ^ 1, &commit, secp256k1_generator_h) == 0);
266+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, 0, val, &commit, secp256k1_generator_h) == 0);
267+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, len - 1, val, &commit, secp256k1_generator_h) == 0);
268+
CHECK(secp256k1_rangeproof_verify_exact(none, proof, len, val ^ 1, &commit, secp256k1_generator_h) == 0);
269269
CHECK(*ecount == 3);
270270
}
271271
}
@@ -680,7 +680,7 @@ static void test_single_value_proof(uint64_t val) {
680680
plen = sizeof(proof);
681681
}
682682
if (using_exact_value) {
683-
CHECK(secp256k1_rangeproof_create_value(ctx, proof, &plen, val, blind, &commit, secp256k1_generator_h) == 1);
683+
CHECK(secp256k1_rangeproof_create_exact(ctx, proof, &plen, val, blind, &commit, secp256k1_generator_h) == 1);
684684
} else {
685685
CHECK(secp256k1_rangeproof_sign(
686686
ctx,
@@ -739,7 +739,7 @@ static void test_single_value_proof(uint64_t val) {
739739
CHECK(message_out[m_len_out] == 0);
740740
}
741741
}
742-
CHECK(secp256k1_rangeproof_verify_value(ctx, proof, plen, val, &commit, secp256k1_generator_h));
742+
CHECK(secp256k1_rangeproof_verify_exact(ctx, proof, plen, val, &commit, secp256k1_generator_h));
743743
}
744744

745745
#define MAX_N_GENS 30
@@ -1028,7 +1028,7 @@ void test_rangeproof_fixed_vectors(void) {
10281028
CHECK(max_value == UINT64_MAX);
10291029
CHECK(m_len == 0);
10301030

1031-
CHECK(secp256k1_rangeproof_verify_value(ctx, vector_3, sizeof(vector_3), UINT64_MAX, &pc, secp256k1_generator_h));
1031+
CHECK(secp256k1_rangeproof_verify_exact(ctx, vector_3, sizeof(vector_3), UINT64_MAX, &pc, secp256k1_generator_h));
10321032
}
10331033
}
10341034

0 commit comments

Comments
 (0)