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

Upstream PRs 969, 956, 783, 976 #144

Merged
merged 15 commits into from
Oct 15, 2021
Merged

Upstream PRs 969, 956, 783, 976 #144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f4edfc7
Improve consistency for NULL arguments in the public interface
elichai Jul 30, 2020
adec5a1
Add missing null check for ctx and input keys in the public API
elichai Jul 30, 2020
3d2f492
ci: Install libasan6 (instead of 5) after Debian upgrade
real-or-random Aug 19, 2021
5d5c74a
tests: Rewrite code to circument potential bug in clang
real-or-random Aug 19, 2021
d7ec49a
Merge bitcoin-core/secp256k1#969: ci: Fixes after Debian release
jonasnick Aug 20, 2021
8de2d86
Bump memory limits in advance of making the ecmult context static.
roconnor-blockstream Jul 6, 2021
16a3cc0
Generate ecmult_static_pre_g.h
roconnor-blockstream Jun 28, 2021
f20dcbb
Correct typo.
roconnor-blockstream Aug 17, 2021
6815761
Remove ecmult_context.
roconnor-blockstream Jun 25, 2021
20abd52
Add tests for pre_g tables.
roconnor-blockstream Jun 26, 2021
9a5a87e
Merge bitcoin-core/secp256k1#956: Replace ecmult_context with a gener…
real-or-random Aug 25, 2021
7271387
Add missing static to secp256k1_schnorrsig_sign_internal
elichai Sep 15, 2021
aa5d34a
Merge bitcoin-core/secp256k1#783: Make the public API docs more consi…
real-or-random Sep 15, 2021
2a3a97c
Merge bitcoin-core/secp256k1#976: `secp256k1_schnorrsig_sign_internal…
real-or-random Sep 15, 2021
938725c
Merge commits 'd7ec49a6 9a5a87e0 aa5d34a8 2a3a97c6 ' into temp-merge-976
jonasnick Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing null check for ctx and input keys in the public API
  • Loading branch information
@elichai
elichai committed Jul 4, 2021
commit adec5a16383f1704d80d7c767b2a65d9221cee08
2 changes: 1 addition & 1 deletion include/secp256k1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ SECP256K1_API secp256k1_context* secp256k1_context_clone(
*/
SECP256K1_API void secp256k1_context_destroy(
secp256k1_context* ctx
);
) SECP256K1_ARG_NONNULL(1);

/** Set a callback function to be called when an illegal argument is passed to
* an API call. It will only trigger for violations that are mentioned
Expand Down
2 changes: 1 addition & 1 deletion include/secp256k1_preallocated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ SECP256K1_API secp256k1_context* secp256k1_context_preallocated_clone(
*/
SECP256K1_API void secp256k1_context_preallocated_destroy(
secp256k1_context* ctx
);
) SECP256K1_ARG_NONNULL(1);

#ifdef __cplusplus
}
Expand Down
6 changes: 3 additions & 3 deletions src/modules/recovery/main_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int secp256k1_ecdsa_recoverable_signature_parse_compact(const secp256k1_context*
int ret = 1;
int overflow = 0;

(void)ctx;
VERIFY_CHECK(ctx != NULL);
ARG_CHECK(sig != NULL);
ARG_CHECK(input64 != NULL);
ARG_CHECK(recid >= 0 && recid <= 3);
Expand All @@ -60,7 +60,7 @@ int secp256k1_ecdsa_recoverable_signature_parse_compact(const secp256k1_context*
int secp256k1_ecdsa_recoverable_signature_serialize_compact(const secp256k1_context* ctx, unsigned char *output64, int *recid, const secp256k1_ecdsa_recoverable_signature* sig) {
secp256k1_scalar r, s;

(void)ctx;
VERIFY_CHECK(ctx != NULL);
ARG_CHECK(output64 != NULL);
ARG_CHECK(sig != NULL);
ARG_CHECK(recid != NULL);
Expand All @@ -75,7 +75,7 @@ int secp256k1_ecdsa_recoverable_signature_convert(const secp256k1_context* ctx,
secp256k1_scalar r, s;
int recid;

(void)ctx;
VERIFY_CHECK(ctx != NULL);
ARG_CHECK(sig != NULL);
ARG_CHECK(sigin != NULL);

Expand Down
2 changes: 2 additions & 0 deletions src/secp256k1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ int secp256k1_ec_pubkey_combine(const secp256k1_context* ctx, secp256k1_pubkey *
secp256k1_gej Qj;
secp256k1_ge Q;

VERIFY_CHECK(ctx != NULL);
ARG_CHECK(pubnonce != NULL);
memset(pubnonce, 0, sizeof(*pubnonce));
ARG_CHECK(n >= 1);
Expand All @@ -779,6 +780,7 @@ int secp256k1_ec_pubkey_combine(const secp256k1_context* ctx, secp256k1_pubkey *
secp256k1_gej_set_infinity(&Qj);

for (i = 0; i < n; i++) {
ARG_CHECK(pubnonces[i] != NULL);
secp256k1_pubkey_load(ctx, &Q, pubnonces[i]);
secp256k1_gej_add_ge(&Qj, &Qj, &Q);
}
Expand Down