From 912f203fc5f53dbecd7498cfcc4f9be36f989b5f Mon Sep 17 00:00:00 2001 From: Gregory Maxwell Date: Mon, 21 Sep 2015 17:21:35 +0000 Subject: [PATCH] Eliminate a few unbraced statements that crept into the code. Also avoids some easily avoided multiple-returns. --- src/bench.h | 20 +++++++++++---- src/bench_ecdh.c | 4 ++- src/bench_internal.c | 4 ++- src/bench_recover.c | 8 ++++-- src/bench_schnorr_verify.c | 8 ++++-- src/bench_sign.c | 8 ++++-- src/bench_verify.c | 8 ++++-- src/group_impl.h | 50 ++++++++++++++++++-------------------- src/secp256k1.c | 17 +++++++------ src/tests.c | 9 ++++--- 10 files changed, 84 insertions(+), 52 deletions(-) diff --git a/src/bench.h b/src/bench.h index db5f68cee1..c80eff9fef 100644 --- a/src/bench.h +++ b/src/bench.h @@ -20,7 +20,9 @@ static double gettimedouble(void) { void print_number(double x) { double y = x; int c = 0; - if (y < 0.0) y = -y; + if (y < 0.0) { + y = -y; + } while (y < 100.0) { y *= 10.0; c++; @@ -35,13 +37,21 @@ void run_benchmark(char *name, void (*benchmark)(void*), void (*setup)(void*), v double max = 0.0; for (i = 0; i < count; i++) { double begin, total; - if (setup) setup(data); + if (setup) { + setup(data); + } begin = gettimedouble(); benchmark(data); total = gettimedouble() - begin; - if (teardown) teardown(data); - if (total < min) min = total; - if (total > max) max = total; + if (teardown) { + teardown(data); + } + if (total < min) { + min = total; + } + if (total > max) { + max = total; + } sum += total; } printf("%s: min ", name); diff --git a/src/bench_ecdh.c b/src/bench_ecdh.c index e28035a26a..3fba769597 100644 --- a/src/bench_ecdh.c +++ b/src/bench_ecdh.c @@ -29,7 +29,9 @@ static void bench_ecdh_setup(void* arg) { }; data->ctx = secp256k1_context_create(0); - for (i = 0; i < 32; i++) data->scalar[i] = i + 1; + for (i = 0; i < 32; i++) { + data->scalar[i] = i + 1; + } CHECK(secp256k1_ec_pubkey_parse(data->ctx, &data->point, point, sizeof(point)) == 1); } diff --git a/src/bench_internal.c b/src/bench_internal.c index dbe93af538..704ebaf68d 100644 --- a/src/bench_internal.c +++ b/src/bench_internal.c @@ -307,7 +307,9 @@ int have_flag(int argc, char** argv, char *flag) { return 1; } while (argv != NULL && argv != argm) { - if (strcmp(*argv, flag) == 0) return 1; + if (strcmp(*argv, flag) == 0) { + return 1; + } argv++; } return 0; diff --git a/src/bench_recover.c b/src/bench_recover.c index 6fb66226b5..3e96aedff8 100644 --- a/src/bench_recover.c +++ b/src/bench_recover.c @@ -40,8 +40,12 @@ void bench_recover_setup(void* arg) { int i; bench_recover_t *data = (bench_recover_t*)arg; - for (i = 0; i < 32; i++) data->msg[i] = 1 + i; - for (i = 0; i < 64; i++) data->sig[i] = 65 + i; + for (i = 0; i < 32; i++) { + data->msg[i] = 1 + i; + } + for (i = 0; i < 64; i++) { + data->sig[i] = 65 + i; + } } int main(void) { diff --git a/src/bench_schnorr_verify.c b/src/bench_schnorr_verify.c index 4487cda7ac..2f67f67896 100644 --- a/src/bench_schnorr_verify.c +++ b/src/bench_schnorr_verify.c @@ -30,10 +30,14 @@ static void benchmark_schnorr_init(void* arg) { int i, k; benchmark_schnorr_verify_t* data = (benchmark_schnorr_verify_t*)arg; - for (i = 0; i < 32; i++) data->msg[i] = 1 + i; + for (i = 0; i < 32; i++) { + data->msg[i] = 1 + i; + } for (k = 0; k < data->numsigs; k++) { secp256k1_pubkey_t pubkey; - for (i = 0; i < 32; i++) data->sigs[k].key[i] = 33 + i + k; + for (i = 0; i < 32; i++) { + data->sigs[k].key[i] = 33 + i + k; + } secp256k1_schnorr_sign(data->ctx, data->sigs[k].sig, data->msg, data->sigs[k].key, NULL, NULL); data->sigs[k].pubkeylen = 33; CHECK(secp256k1_ec_pubkey_create(data->ctx, &pubkey, data->sigs[k].key)); diff --git a/src/bench_sign.c b/src/bench_sign.c index 97ecdb1aae..c211be78bd 100644 --- a/src/bench_sign.c +++ b/src/bench_sign.c @@ -18,8 +18,12 @@ static void bench_sign_setup(void* arg) { int i; bench_sign_t *data = (bench_sign_t*)arg; - for (i = 0; i < 32; i++) data->msg[i] = i + 1; - for (i = 0; i < 32; i++) data->key[i] = i + 65; + for (i = 0; i < 32; i++) { + data->msg[i] = i + 1; + } + for (i = 0; i < 32; i++) { + data->key[i] = i + 65; + } } static void bench_sign(void* arg) { diff --git a/src/bench_verify.c b/src/bench_verify.c index 296385fffb..d0fc3bcf83 100644 --- a/src/bench_verify.c +++ b/src/bench_verify.c @@ -48,8 +48,12 @@ int main(void) { data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - for (i = 0; i < 32; i++) data.msg[i] = 1 + i; - for (i = 0; i < 32; i++) data.key[i] = 33 + i; + for (i = 0; i < 32; i++) { + data.msg[i] = 1 + i; + } + for (i = 0; i < 32; i++) { + data.key[i] = 33 + i; + } data.siglen = 72; CHECK(secp256k1_ecdsa_sign(data.ctx, &sig, data.msg, data.key, NULL, NULL)); CHECK(secp256k1_ecdsa_signature_serialize_der(data.ctx, data.sig, &data.siglen, &sig)); diff --git a/src/group_impl.h b/src/group_impl.h index 9e746e0a38..f5ae1be40c 100644 --- a/src/group_impl.h +++ b/src/group_impl.h @@ -112,18 +112,17 @@ static void secp256k1_ge_set_table_gej_var(size_t len, secp256k1_ge_t *r, const size_t i = len - 1; secp256k1_fe_t zi; - if (len < 1) - return; - - /* Compute the inverse of the last z coordinate, and use it to compute the last affine output. */ - secp256k1_fe_inv(&zi, &a[i].z); - secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi); - - /* Work out way backwards, using the z-ratios to scale the x/y values. */ - while (i > 0) { - secp256k1_fe_mul(&zi, &zi, &zr[i]); - i--; + if (len > 0) { + /* Compute the inverse of the last z coordinate, and use it to compute the last affine output. */ + secp256k1_fe_inv(&zi, &a[i].z); secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi); + + /* Work out way backwards, using the z-ratios to scale the x/y values. */ + while (i > 0) { + secp256k1_fe_mul(&zi, &zi, &zr[i]); + i--; + secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zi); + } } } @@ -131,23 +130,22 @@ static void secp256k1_ge_globalz_set_table_gej(size_t len, secp256k1_ge_t *r, se size_t i = len - 1; secp256k1_fe_t zs; - if (len < 1) - return; + if (len > 0) { + /* The z of the final point gives us the "global Z" for the table. */ + r[i].x = a[i].x; + r[i].y = a[i].y; + *globalz = a[i].z; + r[i].infinity = 0; + zs = zr[i]; - /* The z of the final point gives us the "global Z" for the table. */ - r[i].x = a[i].x; - r[i].y = a[i].y; - *globalz = a[i].z; - r[i].infinity = 0; - zs = zr[i]; - - /* Work our way backwards, using the z-ratios to scale the x/y values. */ - while (i > 0) { - if (i != len - 1) { - secp256k1_fe_mul(&zs, &zs, &zr[i]); + /* Work our way backwards, using the z-ratios to scale the x/y values. */ + while (i > 0) { + if (i != len - 1) { + secp256k1_fe_mul(&zs, &zs, &zr[i]); + } + i--; + secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zs); } - i--; - secp256k1_ge_set_gej_zinv(&r[i], &a[i], &zs); } } diff --git a/src/secp256k1.c b/src/secp256k1.c index 0d94f08233..b017478599 100644 --- a/src/secp256k1.c +++ b/src/secp256k1.c @@ -85,25 +85,26 @@ secp256k1_context_t* secp256k1_context_clone(const secp256k1_context_t* ctx) { } void secp256k1_context_destroy(secp256k1_context_t* ctx) { - if (!ctx) - return; + if (ctx) { + secp256k1_ecmult_context_clear(&ctx->ecmult_ctx); + secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx); - secp256k1_ecmult_context_clear(&ctx->ecmult_ctx); - secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx); - - free(ctx); + free(ctx); + } } void secp256k1_context_set_illegal_callback(secp256k1_context_t* ctx, void (*fun)(const char* message, void* data), const void* data) { - if (!fun) + if (!fun) { fun = default_illegal_callback_fn; + } ctx->illegal_callback.fn = fun; ctx->illegal_callback.data = data; } void secp256k1_context_set_error_callback(secp256k1_context_t* ctx, void (*fun)(const char* message, void* data), const void* data) { - if (!fun) + if (!fun) { fun = default_error_callback_fn; + } ctx->error_callback.fn = fun; ctx->error_callback.data = data; } diff --git a/src/tests.c b/src/tests.c index b92db13274..4332bc8358 100644 --- a/src/tests.c +++ b/src/tests.c @@ -1591,8 +1591,9 @@ void test_constant_wnaf(const secp256k1_scalar_t *number, int w) { secp256k1_scalar_set_int(&shift, 1 << w); /* With USE_ENDOMORPHISM on we only consider 128-bit numbers */ #ifdef USE_ENDOMORPHISM - for (i = 0; i < 16; ++i) + for (i = 0; i < 16; ++i) { secp256k1_scalar_shr_int(&num, 8); + } skew = secp256k1_wnaf_const(wnaf, num, w); #else secp256k1_wnaf_const(wnaf, num, w); @@ -1733,10 +1734,12 @@ void test_scalar_split(void) { secp256k1_scalar_split_lambda(&s1, &slam, &full); /* check that both are <= 128 bits in size */ - if (secp256k1_scalar_is_high(&s1)) + if (secp256k1_scalar_is_high(&s1)) { secp256k1_scalar_negate(&s1, &s1); - if (secp256k1_scalar_is_high(&slam)) + } + if (secp256k1_scalar_is_high(&slam)) { secp256k1_scalar_negate(&slam, &slam); + } secp256k1_scalar_get_b32(tmp, &s1); CHECK(memcmp(zero, tmp, 16) == 0);