Skip to content

Commit c822693

Browse files
sipasipa
committed
Merge pull request bitcoin#301
b183b41 bugfix: "ARG_CHECK(ctx != NULL)" makes no sense (Cory Fields)
2 parents 6d04350 + b183b41 commit c822693

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎src/modules/recovery/main_impl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ int secp256k1_ecdsa_sign_recoverable(const secp256k1_context_t* ctx, const unsig
9090
int ret = 0;
9191
int overflow = 0;
9292
unsigned int count = 0;
93-
ARG_CHECK(ctx != NULL);
93+
VERIFY_CHECK(ctx != NULL);
9494
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
9595
ARG_CHECK(msg32 != NULL);
9696
ARG_CHECK(signature != NULL);
@@ -135,7 +135,7 @@ int secp256k1_ecdsa_recover(const secp256k1_context_t* ctx, const unsigned char
135135
secp256k1_scalar_t r, s;
136136
secp256k1_scalar_t m;
137137
int recid;
138-
ARG_CHECK(ctx != NULL);
138+
VERIFY_CHECK(ctx != NULL);
139139
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
140140
ARG_CHECK(msg32 != NULL);
141141
ARG_CHECK(signature != NULL);

‎src/modules/schnorr/main_impl.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int secp256k1_schnorr_sign(const secp256k1_context_t* ctx, const unsigned char *
2424
int ret = 0;
2525
int overflow = 0;
2626
unsigned int count = 0;
27-
ARG_CHECK(ctx != NULL);
27+
VERIFY_CHECK(ctx != NULL);
2828
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
2929
ARG_CHECK(msg32 != NULL);
3030
ARG_CHECK(sig64 != NULL);
@@ -59,7 +59,7 @@ int secp256k1_schnorr_sign(const secp256k1_context_t* ctx, const unsigned char *
5959

6060
int secp256k1_schnorr_verify(const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig64, const secp256k1_pubkey_t *pubkey) {
6161
secp256k1_ge_t q;
62-
ARG_CHECK(ctx != NULL);
62+
VERIFY_CHECK(ctx != NULL);
6363
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
6464
ARG_CHECK(msg32 != NULL);
6565
ARG_CHECK(sig64 != NULL);
@@ -72,7 +72,7 @@ int secp256k1_schnorr_verify(const secp256k1_context_t* ctx, const unsigned char
7272
int secp256k1_schnorr_recover(const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig64, secp256k1_pubkey_t *pubkey) {
7373
secp256k1_ge_t q;
7474

75-
ARG_CHECK(ctx != NULL);
75+
VERIFY_CHECK(ctx != NULL);
7676
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
7777
ARG_CHECK(msg32 != NULL);
7878
ARG_CHECK(sig64 != NULL);
@@ -94,7 +94,7 @@ int secp256k1_schnorr_generate_nonce_pair(const secp256k1_context_t* ctx, const
9494
secp256k1_ge_t Q;
9595
secp256k1_scalar_t sec;
9696

97-
ARG_CHECK(ctx != NULL);
97+
VERIFY_CHECK(ctx != NULL);
9898
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
9999
ARG_CHECK(msg32 != NULL);
100100
ARG_CHECK(sec32 != NULL);
@@ -133,7 +133,7 @@ int secp256k1_schnorr_partial_sign(const secp256k1_context_t* ctx, const unsigne
133133
int overflow = 0;
134134
secp256k1_scalar_t sec, non;
135135
secp256k1_ge_t pubnon;
136-
ARG_CHECK(ctx != NULL);
136+
VERIFY_CHECK(ctx != NULL);
137137
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
138138
ARG_CHECK(msg32 != NULL);
139139
ARG_CHECK(sig64 != NULL);

‎src/secp256k1.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ int secp256k1_ecdsa_verify(const secp256k1_context_t* ctx, const unsigned char *
211211
secp256k1_ge_t q;
212212
secp256k1_scalar_t r, s;
213213
secp256k1_scalar_t m;
214-
ARG_CHECK(ctx != NULL);
214+
VERIFY_CHECK(ctx != NULL);
215215
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
216216
ARG_CHECK(msg32 != NULL);
217217
ARG_CHECK(sig != NULL);
@@ -263,7 +263,7 @@ int secp256k1_ecdsa_sign(const secp256k1_context_t* ctx, const unsigned char *ms
263263
int ret = 0;
264264
int overflow = 0;
265265
unsigned int count = 0;
266-
ARG_CHECK(ctx != NULL);
266+
VERIFY_CHECK(ctx != NULL);
267267
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
268268
ARG_CHECK(msg32 != NULL);
269269
ARG_CHECK(signature != NULL);
@@ -307,7 +307,7 @@ int secp256k1_ec_seckey_verify(const secp256k1_context_t* ctx, const unsigned ch
307307
secp256k1_scalar_t sec;
308308
int ret;
309309
int overflow;
310-
ARG_CHECK(ctx != NULL);
310+
VERIFY_CHECK(ctx != NULL);
311311
ARG_CHECK(seckey != NULL);
312312
(void)ctx;
313313

@@ -323,7 +323,7 @@ int secp256k1_ec_pubkey_create(const secp256k1_context_t* ctx, secp256k1_pubkey_
323323
secp256k1_scalar_t sec;
324324
int overflow;
325325
int ret = 0;
326-
ARG_CHECK(ctx != NULL);
326+
VERIFY_CHECK(ctx != NULL);
327327
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
328328
ARG_CHECK(pubkey != NULL);
329329
ARG_CHECK(seckey != NULL);
@@ -345,7 +345,7 @@ int secp256k1_ec_privkey_tweak_add(const secp256k1_context_t* ctx, unsigned char
345345
secp256k1_scalar_t sec;
346346
int ret = 0;
347347
int overflow = 0;
348-
ARG_CHECK(ctx != NULL);
348+
VERIFY_CHECK(ctx != NULL);
349349
ARG_CHECK(seckey != NULL);
350350
ARG_CHECK(tweak != NULL);
351351
(void)ctx;
@@ -368,7 +368,7 @@ int secp256k1_ec_pubkey_tweak_add(const secp256k1_context_t* ctx, secp256k1_pubk
368368
secp256k1_scalar_t term;
369369
int ret = 0;
370370
int overflow = 0;
371-
ARG_CHECK(ctx != NULL);
371+
VERIFY_CHECK(ctx != NULL);
372372
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
373373
ARG_CHECK(pubkey != NULL);
374374
ARG_CHECK(tweak != NULL);
@@ -391,7 +391,7 @@ int secp256k1_ec_privkey_tweak_mul(const secp256k1_context_t* ctx, unsigned char
391391
secp256k1_scalar_t sec;
392392
int ret = 0;
393393
int overflow = 0;
394-
ARG_CHECK(ctx != NULL);
394+
VERIFY_CHECK(ctx != NULL);
395395
ARG_CHECK(seckey != NULL);
396396
ARG_CHECK(tweak != NULL);
397397
(void)ctx;
@@ -413,7 +413,7 @@ int secp256k1_ec_pubkey_tweak_mul(const secp256k1_context_t* ctx, secp256k1_pubk
413413
secp256k1_scalar_t factor;
414414
int ret = 0;
415415
int overflow = 0;
416-
ARG_CHECK(ctx != NULL);
416+
VERIFY_CHECK(ctx != NULL);
417417
ARG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx));
418418
ARG_CHECK(pubkey != NULL);
419419
ARG_CHECK(tweak != NULL);
@@ -434,10 +434,10 @@ int secp256k1_ec_pubkey_tweak_mul(const secp256k1_context_t* ctx, secp256k1_pubk
434434
int secp256k1_ec_privkey_export(const secp256k1_context_t* ctx, const unsigned char *seckey, unsigned char *privkey, int *privkeylen, int compressed) {
435435
secp256k1_scalar_t key;
436436
int ret = 0;
437+
VERIFY_CHECK(ctx != NULL);
437438
ARG_CHECK(seckey != NULL);
438439
ARG_CHECK(privkey != NULL);
439440
ARG_CHECK(privkeylen != NULL);
440-
ARG_CHECK(ctx != NULL);
441441
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
442442

443443
secp256k1_scalar_set_b32(&key, seckey, NULL);
@@ -462,7 +462,7 @@ int secp256k1_ec_privkey_import(const secp256k1_context_t* ctx, unsigned char *s
462462
}
463463

464464
int secp256k1_context_randomize(secp256k1_context_t* ctx, const unsigned char *seed32) {
465-
ARG_CHECK(ctx != NULL);
465+
VERIFY_CHECK(ctx != NULL);
466466
ARG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx));
467467
secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, seed32);
468468
return 1;

0 commit comments

Comments
 (0)