Skip to content

Commit 77bde8a

Browse files
afk11afk11
committed
tests: for completeness, don't pass in wrong pubkey type in error testse, even if test fails due to something else
1 parent 8d684d9 commit 77bde8a

8 files changed

Lines changed: 29 additions & 25 deletions

‎secp256k1/tests/secp256k1_schnorrsig_verify_batch_error3.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ $sigBin2 = pack("H*", "b2579a4e31562773bf4b3717527013f9e996f0a712b4606321f16e705
1717
$badMsg = hash('sha256', "WRONG message", true);
1818
$msg321 = hash('sha256', "a message", true);
1919
$msg322 = hash('sha256', "another message", true);
20-
$pubKeyBin1 = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
21-
$pubKeyBin2 = pack("H*", "0262cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
20+
$pubKeyBin1 = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
21+
$pubKeyBin2 = pack("H*", "62cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
2222
$sig1 = null;
2323
$sig2 = null;
2424
$pubKey1 = null;
@@ -32,10 +32,10 @@ echo $result.PHP_EOL;
3232
$result = secp256k1_schnorrsig_parse($ctx, $sig2, $sigBin2);
3333
echo $result.PHP_EOL;
3434

35-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
35+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
3636
echo $result.PHP_EOL;
3737

38-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
38+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
3939
echo $result.PHP_EOL;
4040

4141
$scratch = secp256k1_scratch_space_create($ctx, 1024 * 1024 * 1024 * 1);

‎secp256k1/tests/secp256k1_schnorrsig_verify_batch_error4.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $sigBin1 = pack("H*", "21aedc76051415c8d083683842e5bab7995580f9df8ce703234893d14
1616
$sigBin2 = pack("H*", "b2579a4e31562773bf4b3717527013f9e996f0a712b4606321f16e705b9a5e179b6cd094edfcfcb1cd82c1ac46e496423fc51a9a8f4fbcde4f8b9bc8207f6c87");
1717
$msg321 = hash('sha256', "a message", true);
1818
$msg322 = hash('sha256', "another message", true);
19-
$pubKeyBin1 = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
20-
$pubKeyBin2 = pack("H*", "0262cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
19+
$pubKeyBin1 = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
20+
$pubKeyBin2 = pack("H*", "62cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
2121
$sig1 = null;
2222
$sig2 = null;
2323
$pubKey1 = null;
@@ -31,10 +31,10 @@ echo $result.PHP_EOL;
3131
$result = secp256k1_schnorrsig_parse($ctx, $sig2, $sigBin2);
3232
echo $result.PHP_EOL;
3333

34-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
34+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
3535
echo $result.PHP_EOL;
3636

37-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
37+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
3838
echo $result.PHP_EOL;
3939

4040
$scratch = tmpfile();

‎secp256k1/tests/secp256k1_schnorrsig_verify_batch_error5.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ $sigBin2 = pack("H*", "b2579a4e31562773bf4b3717527013f9e996f0a712b4606321f16e705
1515
$badMsg = hash('sha256', "WRONG message", true);
1616
$msg321 = hash('sha256', "a message", true);
1717
$msg322 = hash('sha256', "another message", true);
18-
$pubKeyBin1 = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
19-
$pubKeyBin2 = pack("H*", "0262cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
18+
$pubKeyBin1 = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
19+
$pubKeyBin2 = pack("H*", "62cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
2020
$sig1 = null;
2121
$sig2 = null;
2222
$pubKey1 = null;
@@ -30,10 +30,10 @@ echo $result.PHP_EOL;
3030
$result = secp256k1_schnorrsig_parse($ctx, $sig2, $sigBin2);
3131
echo $result.PHP_EOL;
3232

33-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
33+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
3434
echo $result.PHP_EOL;
3535

36-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
36+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
3737
echo $result.PHP_EOL;
3838

3939
$scratch = secp256k1_scratch_space_create($ctx, 1024 * 1024 * 1024 * 1);

‎secp256k1/tests/secp256k1_schnorrsig_verify_batch_error6.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ $ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIF
1515
$sigBin1 = pack("H*", "21aedc76051415c8d083683842e5bab7995580f9df8ce703234893d14b8d0fa7e852bee5e7eb94dd11d70185bcaa7ef67aafe28ebc109ee63353c182330be2de");
1616
$msg321 = hash('sha256', "a message", true);
1717
$msg322 = hash('sha256', "another message", true);
18-
$pubKeyBin1 = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
19-
$pubKeyBin2 = pack("H*", "0262cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
18+
$pubKeyBin1 = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
19+
$pubKeyBin2 = pack("H*", "62cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
2020
$sig1 = null;
2121
$pubKey1 = null;
2222
$pubKey2 = null;
@@ -26,10 +26,10 @@ echo "setup:\n";
2626
$result = secp256k1_schnorrsig_parse($ctx, $sig1, $sigBin1);
2727
echo $result.PHP_EOL;
2828

29-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
29+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
3030
echo $result.PHP_EOL;
3131

32-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
32+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
3333
echo $result.PHP_EOL;
3434

3535
$scratch = secp256k1_scratch_space_create($ctx, 1024 * 1024 * 1024 * 1);

‎secp256k1/tests/secp256k1_schnorrsig_verify_batch_error8.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ $ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIF
1313
$sigBin1 = pack("H*", "21aedc76051415c8d083683842e5bab7995580f9df8ce703234893d14b8d0fa7e852bee5e7eb94dd11d70185bcaa7ef67aafe28ebc109ee63353c182330be2de");
1414
$sigBin2 = pack("H*", "b2579a4e31562773bf4b3717527013f9e996f0a712b4606321f16e705b9a5e179b6cd094edfcfcb1cd82c1ac46e496423fc51a9a8f4fbcde4f8b9bc8207f6c87");
1515
$msg321 = hash('sha256', "a message", true);
16-
$pubKeyBin1 = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
17-
$pubKeyBin2 = pack("H*", "0262cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
16+
$pubKeyBin1 = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
17+
$pubKeyBin2 = pack("H*", "62cd4a67842524034e9b3f313feab032bdb4858588c193bc26ce9f380321ef79");
1818
$sig1 = null;
1919
$sig2 = null;
2020
$pubKey1 = null;
@@ -28,10 +28,10 @@ echo $result.PHP_EOL;
2828
$result = secp256k1_schnorrsig_parse($ctx, $sig2, $sigBin2);
2929
echo $result.PHP_EOL;
3030

31-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
31+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey1, $pubKeyBin1);
3232
echo $result.PHP_EOL;
3333

34-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
34+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey2, $pubKeyBin2);
3535
echo $result.PHP_EOL;
3636

3737
$scratch = secp256k1_scratch_space_create($ctx, 1024 * 1024 * 1024 * 1);

‎secp256k1/tests/secp256k1_schnorrsig_verify_error1.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ $ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIF
1414

1515
$sigBin = pack("H*", "21aedc76051415c8d083683842e5bab7995580f9df8ce703234893d14b8d0fa7e852bee5e7eb94dd11d70185bcaa7ef67aafe28ebc109ee63353c182330be2de");
1616
$msg32 = hash('sha256', "a message", true);
17-
$pubKeyBin = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
17+
$pubKeyBin = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
1818
$sig = null;
1919
$pubKey = null;
2020

2121
$result = secp256k1_schnorrsig_parse($ctx, $sig, $sigBin);
2222
echo $result.PHP_EOL;
2323

24-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey, $pubKeyBin);
24+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey, $pubKeyBin);
2525
echo $result.PHP_EOL;
2626

2727
$badctx = tmpfile();

‎secp256k1/tests/secp256k1_schnorrsig_verify_error2.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ $ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIF
1212

1313
$sigBin = pack("H*", "21aedc76051415c8d083683842e5bab7995580f9df8ce703234893d14b8d0fa7e852bee5e7eb94dd11d70185bcaa7ef67aafe28ebc109ee63353c182330be2de");
1414
$msg32 = substr(hash('sha256', "a message", true), 0, 16); // half necessary size
15-
$pubKeyBin = pack("H*", "02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
15+
$pubKeyBin = pack("H*", "eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619");
1616
$sig = null;
1717
$pubKey = null;
1818

1919
$result = secp256k1_schnorrsig_parse($ctx, $sig, $sigBin);
2020
echo $result.PHP_EOL;
2121

22-
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey, $pubKeyBin);
22+
$result = secp256k1_xonly_pubkey_parse($ctx, $pubKey, $pubKeyBin);
2323
echo $result.PHP_EOL;
2424

2525
try {

‎secp256k1/tests/secp256k1_schnorrsig_verify_error6.phpt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ $sig = null;
1919
$result = secp256k1_schnorrsig_parse($ctx, $sig, $sigBin);
2020
echo $result.PHP_EOL;
2121

22-
$pubKey = tmpfile();
22+
$pubKey = null;
23+
$result = secp256k1_ec_pubkey_parse($ctx, $pubKey, hex2bin("02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619"));
24+
echo $result . PHP_EOL;
25+
2326
$result = secp256k1_schnorrsig_verify($ctx, $sig, $msg32, $pubKey);
2427
echo $result.PHP_EOL;
2528

2629
?>
2730
--EXPECT--
2831
1
32+
1
2933
secp256k1_schnorrsig_verify(): supplied resource is not a valid secp256k1_xonly_pubkey resource
3034
0

0 commit comments

Comments
 (0)