frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin-core/secp256k1#1400: ctimetests: Use new SECP256K1_CHECKMEM macros also for ellswift

Browse Source 
9c91ea41b1987d73b9cbb7e569bb1f1e640a4110 ci: Enable ellswift module where it's missing (Tim Ruffing)
db32a247612d3d48c7c617b9dedf067649f82083 ctimetests: Use new SECP256K1_CHECKMEM macros also for ellswift (Tim Ruffing)

Pull request description:

ACKs for top commit:
  hebasto:
    ACK 9c91ea41b1987d73b9cbb7e569bb1f1e640a4110.
  jonasnick:
    ACK 9c91ea41b1987d73b9cbb7e569bb1f1e640a4110

Tree-SHA512: e918236cb38b2bb6e69f84fcfa5f550c54f0df018103627082646a8fd731c238ce68b1b85badf042f08300208015012677143a96f9b97d94065b9a00c1da7876
This commit is contained in:
Jonas Nick 2023-08-16 09:29:27 +00:00
commit b2f6712dd3
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cirrus.yml
View File

@ -104,6 +104,7 @@ task:
ECDH: yes ECDH: yes
RECOVERY: yes RECOVERY: yes
SCHNORRSIG: yes SCHNORRSIG: yes
ELLSWIFT: yes
matrix: matrix:
- env: - env:
CC: i686-linux-gnu-gcc CC: i686-linux-gnu-gcc
@ -224,6 +225,7 @@ task:
ECDH: yes ECDH: yes
RECOVERY: yes RECOVERY: yes
SCHNORRSIG: yes SCHNORRSIG: yes
ELLSWIFT: yes
CTIMETESTS: no CTIMETESTS: no
matrix: matrix:
- name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)" - name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
@ -330,6 +332,7 @@ task:
ECDH: yes ECDH: yes
RECOVERY: yes RECOVERY: yes
SCHNORRSIG: yes SCHNORRSIG: yes
ELLSWIFT: yes
CTIMETESTS: yes CTIMETESTS: yes
CC: clang CC: clang
SECP256K1_TEST_ITERS: 32 SECP256K1_TEST_ITERS: 32

20
src/ctime_tests.c
View File

@ -181,27 +181,27 @@ static void run_tests(secp256k1_context *ctx, unsigned char *key) {
#endif #endif
#ifdef ENABLE_MODULE_ELLSWIFT #ifdef ENABLE_MODULE_ELLSWIFT
VALGRIND_MAKE_MEM_UNDEFINED(key, 32); SECP256K1_CHECKMEM_UNDEFINE(key, 32);
ret = secp256k1_ellswift_create(ctx, ellswift, key, NULL); ret = secp256k1_ellswift_create(ctx, ellswift, key, NULL);
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret)); SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
CHECK(ret == 1); CHECK(ret == 1);
VALGRIND_MAKE_MEM_UNDEFINED(key, 32); SECP256K1_CHECKMEM_UNDEFINE(key, 32);
ret = secp256k1_ellswift_create(ctx, ellswift, key, ellswift); ret = secp256k1_ellswift_create(ctx, ellswift, key, ellswift);
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret)); SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
CHECK(ret == 1); CHECK(ret == 1);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
VALGRIND_MAKE_MEM_UNDEFINED(key, 32); SECP256K1_CHECKMEM_UNDEFINE(key, 32);
VALGRIND_MAKE_MEM_DEFINED(&ellswift, sizeof(ellswift)); SECP256K1_CHECKMEM_DEFINE(&ellswift, sizeof(ellswift));
ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_bip324, NULL); ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_bip324, NULL);
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret)); SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
CHECK(ret == 1); CHECK(ret == 1);
VALGRIND_MAKE_MEM_UNDEFINED(key, 32); SECP256K1_CHECKMEM_UNDEFINE(key, 32);
VALGRIND_MAKE_MEM_DEFINED(&ellswift, sizeof(ellswift)); SECP256K1_CHECKMEM_DEFINE(&ellswift, sizeof(ellswift));
ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_prefix, (void *)prefix); ret = secp256k1_ellswift_xdh(ctx, msg, ellswift, ellswift, key, i, secp256k1_ellswift_xdh_hash_function_prefix, (void *)prefix);
VALGRIND_MAKE_MEM_DEFINED(&ret, sizeof(ret)); SECP256K1_CHECKMEM_DEFINE(&ret, sizeof(ret));
CHECK(ret == 1); CHECK(ret == 1);
} }