Skip to content

Commit b2f6712

Browse files
committed
Merge bitcoin-core/secp256k1#1400: ctimetests: Use new SECP256K1_CHECKMEM macros also for ellswift
9c91ea4 ci: Enable ellswift module where it's missing (Tim Ruffing) db32a24 ctimetests: Use new SECP256K1_CHECKMEM macros also for ellswift (Tim Ruffing) Pull request description: ACKs for top commit: hebasto: ACK 9c91ea4. jonasnick: ACK 9c91ea4 Tree-SHA512: e918236cb38b2bb6e69f84fcfa5f550c54f0df018103627082646a8fd731c238ce68b1b85badf042f08300208015012677143a96f9b97d94065b9a00c1da7876
2 parents ce765a5 + 9c91ea4 commit b2f6712

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.cirrus.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ task:
104104
ECDH: yes
105105
RECOVERY: yes
106106
SCHNORRSIG: yes
107+
ELLSWIFT: yes
107108
matrix:
108109
- env:
109110
CC: i686-linux-gnu-gcc
@@ -224,6 +225,7 @@ task:
224225
ECDH: yes
225226
RECOVERY: yes
226227
SCHNORRSIG: yes
228+
ELLSWIFT: yes
227229
CTIMETESTS: no
228230
matrix:
229231
- name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
@@ -330,6 +332,7 @@ task:
330332
ECDH: yes
331333
RECOVERY: yes
332334
SCHNORRSIG: yes
335+
ELLSWIFT: yes
333336
CTIMETESTS: yes
334337
CC: clang
335338
SECP256K1_TEST_ITERS: 32

src/ctime_tests.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,27 +181,27 @@ static void run_tests(secp256k1_context *ctx, unsigned char *key) {
181181
#endif
182182

183183
#ifdef ENABLE_MODULE_ELLSWIFT
184-
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
184+
SECP256K1_CHECKMEM_UNDEFINE(key, 32);
185185
ret = secp256k1_ellswift_create(ctx, ellswift, key, NULL);
186-
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
186+
SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
187187
CHECK(ret == 1);
188188

189-
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
189+
SECP256K1_CHECKMEM_UNDEFINE(key, 32);
190190
ret = secp256k1_ellswift_create(ctx, ellswift, key, ellswift);
191-
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
191+
SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
192192
CHECK(ret == 1);
193193

194194
for (i = 0; i < 2; i++) {
195-
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
196-
VALGRIND_MAKE_MEM_DEFINED(&ellswift, sizeof(ellswift));
195+
SECP256K1_CHECKMEM_UNDEFINE(key, 32);
196+
SECP256K1_CHECKMEM_DEFINE(&ellswift, sizeof(ellswift));
197197
ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_bip324, NULL);
198-
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
198+
SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
199199
CHECK(ret == 1);
200200

201-
VALGRIND_MAKE_MEM_UNDEFINED(key, 32);
202-
VALGRIND_MAKE_MEM_DEFINED(&ellswift, sizeof(ellswift));
201+
SECP256K1_CHECKMEM_UNDEFINE(key, 32);
202+
SECP256K1_CHECKMEM_DEFINE(&ellswift, sizeof(ellswift));
203203
ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_prefix, (void *)prefix);
204-
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret));
204+
SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
205205
CHECK(ret == 1);
206206
}
207207

0 commit comments

Comments
 (0)