Skip to content

Commit 1fec568

Browse files
andozwandozw
committed
Adds tests against the wycheproof test vectors
Along the same spirit as bitcoin-core/secp256k1#1245
1 parent 6e3808a commit 1fec568

File tree

11 files changed

+8488
-13
lines changed

11 files changed

+8488
-13
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
vendor/
22
.venv3
3+
.vscode/

‎core/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ set(checks_SRC
168168
"src/checks/validate_fees.c"
169169
"src/checks/verify_mix_entropy.c"
170170
"src/checks/verify_protect_pubkey.c"
171-
"src/checks/verify_no_rollback.c")
171+
"src/checks/verify_no_rollback.c"
172+
"src/checks/wycheproof_checks.c")
172173
list(APPEND main_SRC ${checks_SRC})
173174

174175
set(include_SRC

‎core/include/checks.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ int verify_protect_pubkey(void);
4343
int verify_no_rollback(void);
4444
int verify_check_qrsignature_pub(void);
4545
int verify_conv_btc_to_satoshi(void);
46+
int verify_wycheproof(void);
4647

4748
/**
4849
* Verifies that calling handle_incoming_message() with a serialized protobuf

‎core/src/checks/self_checks.c

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,67 @@ int run_self_checks(void) {
8989
return r;
9090
}
9191

92-
for (size_t i = 0; i < self_checks_count; ++i) {
93-
int t = self_checks[i].func();
94-
if (t != 0) {
95-
r = -1;
96-
ERROR("self check failure: %s failed. rc = %d", self_checks[i].name, t);
97-
}
98-
}
99-
100-
// environment specific additional checks + cleanup
101-
int t = post_run_self_checks();
92+
// FIXME: move these tests lower, merge with Ilya's new strategy
93+
int t = verify_wycheproof();
10294
if (t != 0) {
10395
r = -1;
104-
ERROR("post_run_self_checks failed.");
96+
ERROR("verify_wycheproof failed.");
10597
}
98+
99+
/*t = verify_mix_entropy();*/
100+
/*if (t != 0) {*/
101+
/*r = -1;*/
102+
/*ERROR("verify_mix_entropy failed.");*/
103+
/*}*/
104+
105+
/*t = verify_protect_pubkey();*/
106+
/*if (t != 0) {*/
107+
/*r = -1;*/
108+
/*ERROR("verify_protect_pubkey failed.");*/
109+
/*}*/
110+
111+
/*t = verify_bip32();*/
112+
/*if (t != 0) {*/
113+
/*r = -1;*/
114+
/*ERROR("self check failure: verify_bip32() failed.");*/
115+
/*}*/
116+
117+
/*t = verify_sign_tx();*/
118+
/*if (t != 0) {*/
119+
/*r = -1;*/
120+
/*ERROR("self check failure: verify_sign_tx failed.");*/
121+
/*}*/
122+
/*t = verify_check_qrsignature_pub();*/
123+
/*if (t != 0) {*/
124+
/*r = -1;*/
125+
/*ERROR("self check failure: verify_check_signature_pub failed. rc = %d", t);*/
126+
/*}*/
127+
128+
/*t = verify_validate_fees();*/
129+
/*if (t != 0) {*/
130+
/*r = -1;*/
131+
/*ERROR("self check failure: verify_validate_fees failed.");*/
132+
/*}*/
133+
134+
/*t = verify_no_rollback();*/
135+
/*if (t != 0) {*/
136+
/*r = -1;*/
137+
/*ERROR("self check failure: verify_no_rollback failed.");*/
138+
/*}*/
139+
140+
/*t = verify_conv_btc_to_satoshi();*/
141+
/*if (t != 0) {*/
142+
/*r = -1;*/
143+
/*ERROR("self check failure: verify_conv_btc_to_satoshi failed.");*/
144+
/*}*/
145+
146+
/*// environment specific additional checks + cleanup*/
147+
/*t = post_run_self_checks();*/
148+
/*if (t != 0) {*/
149+
/*r = -1;*/
150+
/*ERROR("post_run_self_checks failed.");*/
151+
/*}*/
152+
153+
// FIXME: move wycheproof tests here
106154
return r;
107155
}

‎core/src/checks/wycheproof/WYCHEPROOF_COPYING

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
* The file `ecdsa_secp256k1_sha256_bitcoin_test.json` in this directory
2+
comes from Google's project Wycheproof with git commit
3+
`b063b4aedae951c69df014cd25fa6d69ae9e8cb9`, see
4+
https://github.com/google/wycheproof/blob/b063b4aedae951c69df014cd25fa6d69ae9e8cb9/testvectors_v1/ecdsa_secp256k1_sha256_bitcoin_test.json
5+
6+
* The file `ecdsa_secp256k1_sha256_bitcoin_test.h` is generated from
7+
`ecdsa_secp256k1_sha256_bitcoin_test.json` using the script
8+
`tests_wycheproof_generate.py`.
9+
10+
-------------------------------------------------------------------------------
11+
12+
Apache License
13+
Version 2.0, January 2004
14+
http://www.apache.org/licenses/
15+
16+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
17+
18+
1. Definitions.
19+
20+
"License" shall mean the terms and conditions for use, reproduction,
21+
and distribution as defined by Sections 1 through 9 of this document.
22+
23+
"Licensor" shall mean the copyright owner or entity authorized by
24+
the copyright owner that is granting the License.
25+
26+
"Legal Entity" shall mean the union of the acting entity and all
27+
other entities that control, are controlled by, or are under common
28+
control with that entity. For the purposes of this definition,
29+
"control" means (i) the power, direct or indirect, to cause the
30+
direction or management of such entity, whether by contract or
31+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
32+
outstanding shares, or (iii) beneficial ownership of such entity.
33+
34+
"You" (or "Your") shall mean an individual or Legal Entity
35+
exercising permissions granted by this License.
36+
37+
"Source" form shall mean the preferred form for making modifications,
38+
including but not limited to software source code, documentation
39+
source, and configuration files.
40+
41+
"Object" form shall mean any form resulting from mechanical
42+
transformation or translation of a Source form, including but
43+
not limited to compiled object code, generated documentation,
44+
and conversions to other media types.
45+
46+
"Work" shall mean the work of authorship, whether in Source or
47+
Object form, made available under the License, as indicated by a
48+
copyright notice that is included in or attached to the work
49+
(an example is provided in the Appendix below).
50+
51+
"Derivative Works" shall mean any work, whether in Source or Object
52+
form, that is based on (or derived from) the Work and for which the
53+
editorial revisions, annotations, elaborations, or other modifications
54+
represent, as a whole, an original work of authorship. For the purposes
55+
of this License, Derivative Works shall not include works that remain
56+
separable from, or merely link (or bind by name) to the interfaces of,
57+
the Work and Derivative Works thereof.
58+
59+
"Contribution" shall mean any work of authorship, including
60+
the original version of the Work and any modifications or additions
61+
to that Work or Derivative Works thereof, that is intentionally
62+
submitted to Licensor for inclusion in the Work by the copyright owner
63+
or by an individual or Legal Entity authorized to submit on behalf of
64+
the copyright owner. For the purposes of this definition, "submitted"
65+
means any form of electronic, verbal, or written communication sent
66+
to the Licensor or its representatives, including but not limited to
67+
communication on electronic mailing lists, source code control systems,
68+
and issue tracking systems that are managed by, or on behalf of, the
69+
Licensor for the purpose of discussing and improving the Work, but
70+
excluding communication that is conspicuously marked or otherwise
71+
designated in writing by the copyright owner as "Not a Contribution."
72+
73+
"Contributor" shall mean Licensor and any individual or Legal Entity
74+
on behalf of whom a Contribution has been received by Licensor and
75+
subsequently incorporated within the Work.
76+
77+
2. Grant of Copyright License. Subject to the terms and conditions of
78+
this License, each Contributor hereby grants to You a perpetual,
79+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
80+
copyright license to reproduce, prepare Derivative Works of,
81+
publicly display, publicly perform, sublicense, and distribute the
82+
Work and such Derivative Works in Source or Object form.
83+
84+
3. Grant of Patent License. Subject to the terms and conditions of
85+
this License, each Contributor hereby grants to You a perpetual,
86+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
87+
(except as stated in this section) patent license to make, have made,
88+
use, offer to sell, sell, import, and otherwise transfer the Work,
89+
where such license applies only to those patent claims licensable
90+
by such Contributor that are necessarily infringed by their
91+
Contribution(s) alone or by combination of their Contribution(s)
92+
with the Work to which such Contribution(s) was submitted. If You
93+
institute patent litigation against any entity (including a
94+
cross-claim or counterclaim in a lawsuit) alleging that the Work
95+
or a Contribution incorporated within the Work constitutes direct
96+
or contributory patent infringement, then any patent licenses
97+
granted to You under this License for that Work shall terminate
98+
as of the date such litigation is filed.
99+
100+
4. Redistribution. You may reproduce and distribute copies of the
101+
Work or Derivative Works thereof in any medium, with or without
102+
modifications, and in Source or Object form, provided that You
103+
meet the following conditions:
104+
105+
(a) You must give any other recipients of the Work or
106+
Derivative Works a copy of this License; and
107+
108+
(b) You must cause any modified files to carry prominent notices
109+
stating that You changed the files; and
110+
111+
(c) You must retain, in the Source form of any Derivative Works
112+
that You distribute, all copyright, patent, trademark, and
113+
attribution notices from the Source form of the Work,
114+
excluding those notices that do not pertain to any part of
115+
the Derivative Works; and
116+
117+
(d) If the Work includes a "NOTICE" text file as part of its
118+
distribution, then any Derivative Works that You distribute must
119+
include a readable copy of the attribution notices contained
120+
within such NOTICE file, excluding those notices that do not
121+
pertain to any part of the Derivative Works, in at least one
122+
of the following places: within a NOTICE text file distributed
123+
as part of the Derivative Works; within the Source form or
124+
documentation, if provided along with the Derivative Works; or,
125+
within a display generated by the Derivative Works, if and
126+
wherever such third-party notices normally appear. The contents
127+
of the NOTICE file are for informational purposes only and
128+
do not modify the License. You may add Your own attribution
129+
notices within Derivative Works that You distribute, alongside
130+
or as an addendum to the NOTICE text from the Work, provided
131+
that such additional attribution notices cannot be construed
132+
as modifying the License.
133+
134+
You may add Your own copyright statement to Your modifications and
135+
may provide additional or different license terms and conditions
136+
for use, reproduction, or distribution of Your modifications, or
137+
for any such Derivative Works as a whole, provided Your use,
138+
reproduction, and distribution of the Work otherwise complies with
139+
the conditions stated in this License.
140+
141+
5. Submission of Contributions. Unless You explicitly state otherwise,
142+
any Contribution intentionally submitted for inclusion in the Work
143+
by You to the Licensor shall be under the terms and conditions of
144+
this License, without any additional terms or conditions.
145+
Notwithstanding the above, nothing herein shall supersede or modify
146+
the terms of any separate license agreement you may have executed
147+
with Licensor regarding such Contributions.
148+
149+
6. Trademarks. This License does not grant permission to use the trade
150+
names, trademarks, service marks, or product names of the Licensor,
151+
except as required for reasonable and customary use in describing the
152+
origin of the Work and reproducing the content of the NOTICE file.
153+
154+
7. Disclaimer of Warranty. Unless required by applicable law or
155+
agreed to in writing, Licensor provides the Work (and each
156+
Contributor provides its Contributions) on an "AS IS" BASIS,
157+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
158+
implied, including, without limitation, any warranties or conditions
159+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
160+
PARTICULAR PURPOSE. You are solely responsible for determining the
161+
appropriateness of using or redistributing the Work and assume any
162+
risks associated with Your exercise of permissions under this License.
163+
164+
8. Limitation of Liability. In no event and under no legal theory,
165+
whether in tort (including negligence), contract, or otherwise,
166+
unless required by applicable law (such as deliberate and grossly
167+
negligent acts) or agreed to in writing, shall any Contributor be
168+
liable to You for damages, including any direct, indirect, special,
169+
incidental, or consequential damages of any character arising as a
170+
result of this License or out of the use or inability to use the
171+
Work (including but not limited to damages for loss of goodwill,
172+
work stoppage, computer failure or malfunction, or any and all
173+
other commercial damages or losses), even if such Contributor
174+
has been advised of the possibility of such damages.
175+
176+
9. Accepting Warranty or Additional Liability. While redistributing
177+
the Work or Derivative Works thereof, You may choose to offer,
178+
and charge a fee for, acceptance of support, warranty, indemnity,
179+
or other liability obligations and/or rights consistent with this
180+
License. However, in accepting such obligations, You may act only
181+
on Your own behalf and on Your sole responsibility, not on behalf
182+
of any other Contributor, and only if You agree to indemnify,
183+
defend, and hold each Contributor harmless for any liability
184+
incurred by, or claims asserted against, such Contributor by reason
185+
of your accepting any such warranty or additional liability.
186+
187+
END OF TERMS AND CONDITIONS
188+
189+
APPENDIX: How to apply the Apache License to your work.
190+
191+
To apply the Apache License to your work, attach the following
192+
boilerplate notice, with the fields enclosed by brackets "[]"
193+
replaced with your own identifying information. (Don't include
194+
the brackets!) The text should be enclosed in the appropriate
195+
comment syntax for the file format. We also recommend that a
196+
file or class name and description of purpose be included on the
197+
same "printed page" as the copyright notice for easier
198+
identification within third-party archives.
199+
200+
Copyright [yyyy] [name of copyright owner]
201+
202+
Licensed under the Apache License, Version 2.0 (the "License");
203+
you may not use this file except in compliance with the License.
204+
You may obtain a copy of the License at
205+
206+
http://www.apache.org/licenses/LICENSE-2.0
207+
208+
Unless required by applicable law or agreed to in writing, software
209+
distributed under the License is distributed on an "AS IS" BASIS,
210+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
211+
See the License for the specific language governing permissions and
212+
limitations under the License.

0 commit comments

Comments
 (0)