Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes necessary for usage on Trezor #53

Merged
merged 19 commits into from
Apr 12, 2019
Merged

Changes necessary for usage on Trezor #53

merged 19 commits into from
Apr 12, 2019

Conversation

real-or-random
Copy link
Collaborator

@real-or-random
Prepare for manual memory management in preallocated memory
3f1a858 
 * Determine ALIGNMENT more cleverly and move it to util.h
 * Implement manual_malloc() helper function
@real-or-random
Add size constants for preallocated memory
16d4a0a
@real-or-random
Switch to a single malloc call
1738dd0
@real-or-random
Support cloning a context into preallocated memory
19debda
@real-or-random
Check arguments of _preallocated functions
1a1febf
@real-or-random
Add tests for contexts in preallocated memory
7a848d2
@real-or-random
Export _preallocated functions
7366ab7
@real-or-random
Move _preallocated functions to separate header
e4a2f8e
@real-or-random
Explain caller's obligations for preallocated memory
af2569b
@real-or-random
Replace CHECKs for no_precomp ctx by ARG_CHECKs without a return
b7fca75
@real-or-random
Allow usage of external default callbacks
9a949e5
@real-or-random
Include stdio.h and stdlib.h explicitly in secp256k1.c
08e2e19
@real-or-random
Add secp256k1_ prefix to default callback functions
9c1dda8
@real-or-random real-or-random mentioned this pull request Apr 2, 2019
Merged
6 tasks
@real-or-random
Copy link
Collaborator Author

Forced pushed because I forgot to cherry-pick the (cosmetic) 76c7964 from bitcoin-core/secp256k1#596, and I also added a zkp-specific follow-up commit on this commit.

@apoelstra
Copy link
Contributor

Also missing 8558e3d from bitcoin-core/secp256k1#595

@apoelstra
Copy link
Contributor

Would be good to add ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp); to secp256k1_cotnext_destroy as well as secp256k1_prealloc_destroy when cherry-picking 2ca27e2 from bitcoin-core/secp256k1#595

I also have a bunch of spacing changes in a6add6c, also from bitcoin-core/secp256k1#595, that you don't have. I think in this case I screwed up the cherry-pick and created a bigger diff than I needed to.

@real-or-random
Copy link
Collaborator Author

Would be good to add ARG_CHECK_NO_RETURN(ctx != secp256k1_context_no_precomp); to secp256k1_cotnext_destroy as well as secp256k1_prealloc_destroy when cherry-picking 2ca27e2 from bitcoin-core/secp256k1#595

This check is actually present in the current PR in secp256k1_preallocated_destroy (and secp256k1_context_destroy is also covered because it calls secp256k1_preallocated_destroy internally).

I'm addressing the other issues.

@real-or-random
Copy link
Collaborator Author

I added 8558e3d and a fixup from bitcoin-core/secp256k1#596, both just on top. I didn't squash or reorder to make sure you don't have to recreate it again from scratch. Let me know when I should squash.

@apoelstra
Copy link
Contributor

ACK. Go ahead and squash.

real-or-random and others added 6 commits April 12, 2019 17:36
@real-or-random
Make WINDOW_G configurable
a364c95 
This makes WINDOW_G a configurable value in the range of [3..24].
The upper limit of 24 is a defensive choice. The code is probably
correct for values up to 33 but those larger values yield in huge
tables (>= 256MiB), which are i) unlikely to be really beneficial
in practice and ii) increasingly difficult to test.
@real-or-random
Clean up ./configure help strings
39fbe8a
@real-or-random
Clean up ./configure help strings (zkp extensions)
b8c1bc5
@real-or-random
Make randomization of a non-signing context a noop
edd941c 
Before this commit secp256k1_context_randomize called illegal_callback
when called on a context not initialized for signing. This is not
documented. Moreover, it is not desirable because non-signing contexts
may use randomization in the future.

This commit makes secp256k1_context_randomize a noop in this case. This
is safe because the context cannot be used for signing anyway.

This fixes #573 and it fixes rust-bitcoin/rust-secp256k1#82.
@practicalswift @real-or-random
Make sure we're not using an uninitialized variable in secp256k1_wnaf…
767317c 
…_const(...)
@real-or-random
Add missing #(un)defines to base-config.h
cd364a0
@real-or-random
Copy link
Collaborator Author

done

@apoelstra
Copy link
Contributor

ACK

@apoelstra apoelstra merged commit 1c830b4 into BlockstreamResearch:secp256k1-zkp Apr 12, 2019
@vhnatyk vhnatyk mentioned this pull request Jun 19, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@real-or-random @apoelstra @practicalswift