Skip to content

Commit 97a98be

Browse files
real-or-randomreal-or-random
committed
schnorrsig: Refactor test vector code to allow varlen messages
1 parent 9eb6934 commit 97a98be

File tree

1 file changed

+34
-26
lines changed

1 file changed

+34
-26
lines changed

‎src/modules/schnorrsig/tests_impl.h

+34-26
Original file line numberDiff line numberDiff line change
@@ -215,28 +215,36 @@ static void test_schnorrsig_sha256_tagged(void) {
215215

216216
/* Helper function for schnorrsig_bip_vectors
217217
* Signs the message and checks that it's the same as expected_sig. */
218-
static void test_schnorrsig_bip_vectors_check_signing(const unsigned char *sk, const unsigned char *pk_serialized, const unsigned char *aux_rand, const unsigned char *msg32, const unsigned char *expected_sig) {
218+
static void test_schnorrsig_bip_vectors_check_signing(const unsigned char *sk, const unsigned char *pk_serialized, const unsigned char *aux_rand, const unsigned char *msg, size_t msglen, const unsigned char *expected_sig) {
219219
unsigned char sig[64];
220220
secp256k1_keypair keypair;
221221
secp256k1_xonly_pubkey pk, pk_expected;
222222

223+
secp256k1_schnorrsig_extraparams extraparams = SECP256K1_SCHNORRSIG_EXTRAPARAMS_INIT;
224+
extraparams.ndata = (unsigned char*)aux_rand;
225+
223226
CHECK(secp256k1_keypair_create(CTX, &keypair, sk));
224-
CHECK(secp256k1_schnorrsig_sign32(CTX, sig, msg32, &keypair, aux_rand));
227+
CHECK(secp256k1_schnorrsig_sign_custom(CTX, sig, msg, msglen, &keypair, &extraparams));
225228
CHECK(secp256k1_memcmp_var(sig, expected_sig, 64) == 0);
229+
if (msglen == 32) {
230+
memset(sig, 0, 64);
231+
CHECK(secp256k1_schnorrsig_sign32(CTX, sig, msg, &keypair, aux_rand));
232+
CHECK(secp256k1_memcmp_var(sig, expected_sig, 64) == 0);
233+
}
226234

227235
CHECK(secp256k1_xonly_pubkey_parse(CTX, &pk_expected, pk_serialized));
228236
CHECK(secp256k1_keypair_xonly_pub(CTX, &pk, NULL, &keypair));
229237
CHECK(secp256k1_memcmp_var(&pk, &pk_expected, sizeof(pk)) == 0);
230-
CHECK(secp256k1_schnorrsig_verify(CTX, sig, msg32, 32, &pk));
238+
CHECK(secp256k1_schnorrsig_verify(CTX, sig, msg, msglen, &pk));
231239
}
232240

233241
/* Helper function for schnorrsig_bip_vectors
234242
* Checks that both verify and verify_batch (TODO) return the same value as expected. */
235-
static void test_schnorrsig_bip_vectors_check_verify(const unsigned char *pk_serialized, const unsigned char *msg32, const unsigned char *sig, int expected) {
243+
static void test_schnorrsig_bip_vectors_check_verify(const unsigned char *pk_serialized, const unsigned char *msg, size_t msglen, const unsigned char *sig, int expected) {
236244
secp256k1_xonly_pubkey pk;
237245

238246
CHECK(secp256k1_xonly_pubkey_parse(CTX, &pk, pk_serialized));
239-
CHECK(expected == secp256k1_schnorrsig_verify(CTX, sig, msg32, 32, &pk));
247+
CHECK(expected == secp256k1_schnorrsig_verify(CTX, sig, msg, msglen, &pk));
240248
}
241249

242250
/* Test vectors according to BIP-340 ("Schnorr Signatures for secp256k1"). See
@@ -256,7 +264,7 @@ static void test_schnorrsig_bip_vectors(void) {
256264
0xB5, 0x31, 0xC8, 0x45, 0x83, 0x6F, 0x99, 0xB0,
257265
0x86, 0x01, 0xF1, 0x13, 0xBC, 0xE0, 0x36, 0xF9
258266
};
259-
unsigned char aux_rand[32] = {
267+
const unsigned char aux_rand[32] = {
260268
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
261269
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
262270
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -278,8 +286,8 @@ static void test_schnorrsig_bip_vectors(void) {
278286
0xEB, 0xEE, 0xE8, 0xFD, 0xB2, 0x17, 0x2F, 0x47,
279287
0x7D, 0xF4, 0x90, 0x0D, 0x31, 0x05, 0x36, 0xC0
280288
};
281-
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sig);
282-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 1);
289+
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sizeof(msg), sig);
290+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 1);
283291
}
284292
{
285293
/* Test vector 1 */
@@ -295,7 +303,7 @@ static void test_schnorrsig_bip_vectors(void) {
295303
0x58, 0xFE, 0xAE, 0x1D, 0xA2, 0xDE, 0xCE, 0xD8,
296304
0x43, 0x24, 0x0F, 0x7B, 0x50, 0x2B, 0xA6, 0x59
297305
};
298-
unsigned char aux_rand[32] = {
306+
const unsigned char aux_rand[32] = {
299307
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
300308
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
301309
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -317,8 +325,8 @@ static void test_schnorrsig_bip_vectors(void) {
317325
0x89, 0x7E, 0xFC, 0xB6, 0x39, 0xEA, 0x87, 0x1C,
318326
0xFA, 0x95, 0xF6, 0xDE, 0x33, 0x9E, 0x4B, 0x0A
319327
};
320-
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sig);
321-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 1);
328+
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sizeof(msg), sig);
329+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 1);
322330
}
323331
{
324332
/* Test vector 2 */
@@ -334,7 +342,7 @@ static void test_schnorrsig_bip_vectors(void) {
334342
0x01, 0x39, 0x71, 0x53, 0x09, 0xB0, 0x86, 0xC9,
335343
0x60, 0xE1, 0x8F, 0xD9, 0x69, 0x77, 0x4E, 0xB8
336344
};
337-
unsigned char aux_rand[32] = {
345+
const unsigned char aux_rand[32] = {
338346
0xC8, 0x7A, 0xA5, 0x38, 0x24, 0xB4, 0xD7, 0xAE,
339347
0x2E, 0xB0, 0x35, 0xA2, 0xB5, 0xBB, 0xBC, 0xCC,
340348
0x08, 0x0E, 0x76, 0xCD, 0xC6, 0xD1, 0x69, 0x2C,
@@ -356,8 +364,8 @@ static void test_schnorrsig_bip_vectors(void) {
356364
0x7A, 0xDE, 0xA9, 0x8D, 0x82, 0xF8, 0x48, 0x1E,
357365
0x0E, 0x1E, 0x03, 0x67, 0x4A, 0x6F, 0x3F, 0xB7
358366
};
359-
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sig);
360-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 1);
367+
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sizeof(msg), sig);
368+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 1);
361369
}
362370
{
363371
/* Test vector 3 */
@@ -373,7 +381,7 @@ static void test_schnorrsig_bip_vectors(void) {
373381
0x3A, 0x0D, 0x95, 0xFB, 0xF2, 0x1D, 0x46, 0x8A,
374382
0x1B, 0x33, 0xF8, 0xC1, 0x60, 0xD8, 0xF5, 0x17
375383
};
376-
unsigned char aux_rand[32] = {
384+
const unsigned char aux_rand[32] = {
377385
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
378386
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
379387
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -395,8 +403,8 @@ static void test_schnorrsig_bip_vectors(void) {
395403
0xF2, 0x5F, 0xD7, 0x88, 0x81, 0xEB, 0xB3, 0x27,
396404
0x71, 0xFC, 0x59, 0x22, 0xEF, 0xC6, 0x6E, 0xA3
397405
};
398-
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sig);
399-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 1);
406+
test_schnorrsig_bip_vectors_check_signing(sk, pk, aux_rand, msg, sizeof(msg), sig);
407+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 1);
400408
}
401409
{
402410
/* Test vector 4 */
@@ -422,7 +430,7 @@ static void test_schnorrsig_bip_vectors(void) {
422430
0x60, 0xCB, 0x71, 0xC0, 0x4E, 0x80, 0xF5, 0x93,
423431
0x06, 0x0B, 0x07, 0xD2, 0x83, 0x08, 0xD7, 0xF4
424432
};
425-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 1);
433+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 1);
426434
}
427435
{
428436
/* Test vector 5 */
@@ -460,7 +468,7 @@ static void test_schnorrsig_bip_vectors(void) {
460468
0x7A, 0x73, 0xC6, 0x43, 0xE1, 0x66, 0xBE, 0x5E,
461469
0xBE, 0xAF, 0xA3, 0x4B, 0x1A, 0xC5, 0x53, 0xE2
462470
};
463-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
471+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
464472
}
465473
{
466474
/* Test vector 7 */
@@ -486,7 +494,7 @@ static void test_schnorrsig_bip_vectors(void) {
486494
0x62, 0x2A, 0x95, 0x4C, 0xFE, 0x54, 0x57, 0x35,
487495
0xAA, 0xEA, 0x51, 0x34, 0xFC, 0xCD, 0xB2, 0xBD
488496
};
489-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
497+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
490498
}
491499
{
492500
/* Test vector 8 */
@@ -512,7 +520,7 @@ static void test_schnorrsig_bip_vectors(void) {
512520
0xE8, 0xD7, 0xC9, 0x3E, 0x00, 0xC5, 0xED, 0x0C,
513521
0x18, 0x34, 0xFF, 0x0D, 0x0C, 0x2E, 0x6D, 0xA6
514522
};
515-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
523+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
516524
}
517525
{
518526
/* Test vector 9 */
@@ -538,7 +546,7 @@ static void test_schnorrsig_bip_vectors(void) {
538546
0x4F, 0xB7, 0x34, 0x76, 0xF0, 0xD5, 0x94, 0xDC,
539547
0xB6, 0x5C, 0x64, 0x25, 0xBD, 0x18, 0x60, 0x51
540548
};
541-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
549+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
542550
}
543551
{
544552
/* Test vector 10 */
@@ -564,7 +572,7 @@ static void test_schnorrsig_bip_vectors(void) {
564572
0xDB, 0xA8, 0x7F, 0x11, 0xAC, 0x67, 0x54, 0xF9,
565573
0x37, 0x80, 0xD5, 0xA1, 0x83, 0x7C, 0xF1, 0x97
566574
};
567-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
575+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
568576
}
569577
{
570578
/* Test vector 11 */
@@ -590,7 +598,7 @@ static void test_schnorrsig_bip_vectors(void) {
590598
0xD1, 0xD7, 0x13, 0xA8, 0xAE, 0x82, 0xB3, 0x2F,
591599
0xA7, 0x9D, 0x5F, 0x7F, 0xC4, 0x07, 0xD3, 0x9B
592600
};
593-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
601+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
594602
}
595603
{
596604
/* Test vector 12 */
@@ -616,7 +624,7 @@ static void test_schnorrsig_bip_vectors(void) {
616624
0xD1, 0xD7, 0x13, 0xA8, 0xAE, 0x82, 0xB3, 0x2F,
617625
0xA7, 0x9D, 0x5F, 0x7F, 0xC4, 0x07, 0xD3, 0x9B
618626
};
619-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
627+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
620628
}
621629
{
622630
/* Test vector 13 */
@@ -642,7 +650,7 @@ static void test_schnorrsig_bip_vectors(void) {
642650
0xBA, 0xAE, 0xDC, 0xE6, 0xAF, 0x48, 0xA0, 0x3B,
643651
0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41
644652
};
645-
test_schnorrsig_bip_vectors_check_verify(pk, msg, sig, 0);
653+
test_schnorrsig_bip_vectors_check_verify(pk, msg, sizeof(msg), sig, 0);
646654
}
647655
{
648656
/* Test vector 14 */

0 commit comments

Comments
 (0)