Skip to content

Commit 961ec25

Browse files
musig: Fix clearing of pubnonces
Fixes a silent merge conflict between #1614 and #1579.
1 parent 3186082 commit 961ec25

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/modules/musig/session_impl.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,18 @@ static int secp256k1_musig_nonce_gen_internal(const secp256k1_context* ctx, secp
445445
secp256k1_musig_secnonce_save(secnonce, k, &pk);
446446
secp256k1_musig_secnonce_invalidate(ctx, secnonce, !ret);
447447

448+
/* Compute pubnonce as two gejs */
448449
for (i = 0; i < 2; i++) {
449450
secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &nonce_ptj[i], &k[i]);
450451
secp256k1_scalar_clear(&k[i]);
451-
secp256k1_gej_clear(&nonce_ptj);
452452
}
453+
454+
/* Batch convert to two public ges */
453455
secp256k1_ge_set_all_gej(nonce_pts, nonce_ptj, 2);
456+
for (i = 0; i < 2; i++) {
457+
secp256k1_gej_clear(&nonce_ptj[i]);
458+
}
459+
454460
for (i = 0; i < 2; i++) {
455461
secp256k1_declassify(ctx, &nonce_pts[i], sizeof(nonce_pts[i]));
456462
}

0 commit comments

Comments
 (0)