Skip to content

Commit 6ad5cdb

Browse files
sipasipa
committed
Merge bitcoin-core#479: Get rid of reserved _t in type names
d1dc9df Get rid of reserved _t in type names (Pieter Wuille) Pull request description: Tree-SHA512: 5da4a2cb15106c47fbe14346562444eff322a5e4e2386af8b0b879b72e22f08d704ac09746d6a22ff76e8892fc20208932b2a45d01de0e2e089686dabe45e633
2 parents 0b70241 + d1dc9df commit 6ad5cdb

File tree

12 files changed

+79
-79
lines changed

12 files changed

+79
-79
lines changed

‎src/bench_ecdh.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ typedef struct {
1515
secp256k1_context *ctx;
1616
secp256k1_pubkey point;
1717
unsigned char scalar[32];
18-
} bench_ecdh_t;
18+
} bench_ecdh;
1919

2020
static void bench_ecdh_setup(void* arg) {
2121
int i;
22-
bench_ecdh_t *data = (bench_ecdh_t*)arg;
22+
bench_ecdh *data = (bench_ecdh*)arg;
2323
const unsigned char point[] = {
2424
0x03,
2525
0x54, 0x94, 0xc1, 0x5d, 0x32, 0x09, 0x97, 0x06,
@@ -39,15 +39,15 @@ static void bench_ecdh_setup(void* arg) {
3939
static void bench_ecdh(void* arg) {
4040
int i;
4141
unsigned char res[32];
42-
bench_ecdh_t *data = (bench_ecdh_t*)arg;
42+
bench_ecdh *data = (bench_ecdh*)arg;
4343

4444
for (i = 0; i < 20000; i++) {
4545
CHECK(secp256k1_ecdh(data->ctx, res, &data->point, data->scalar) == 1);
4646
}
4747
}
4848

4949
int main(void) {
50-
bench_ecdh_t data;
50+
bench_ecdh data;
5151

5252
run_benchmark("ecdh", bench_ecdh, bench_ecdh_setup, NULL, &data, 10, 20000);
5353
return 0;

‎src/bench_internal.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ typedef struct {
2525
secp256k1_gej gej_x, gej_y;
2626
unsigned char data[64];
2727
int wnaf[256];
28-
} bench_inv_t;
28+
} bench_inv;
2929

3030
void bench_setup(void* arg) {
31-
bench_inv_t *data = (bench_inv_t*)arg;
31+
bench_inv *data = (bench_inv*)arg;
3232

3333
static const unsigned char init_x[32] = {
3434
0x02, 0x03, 0x05, 0x07, 0x0b, 0x0d, 0x11, 0x13,
@@ -58,7 +58,7 @@ void bench_setup(void* arg) {
5858

5959
void bench_scalar_add(void* arg) {
6060
int i;
61-
bench_inv_t *data = (bench_inv_t*)arg;
61+
bench_inv *data = (bench_inv*)arg;
6262

6363
for (i = 0; i < 2000000; i++) {
6464
secp256k1_scalar_add(&data->scalar_x, &data->scalar_x, &data->scalar_y);
@@ -67,7 +67,7 @@ void bench_scalar_add(void* arg) {
6767

6868
void bench_scalar_negate(void* arg) {
6969
int i;
70-
bench_inv_t *data = (bench_inv_t*)arg;
70+
bench_inv *data = (bench_inv*)arg;
7171

7272
for (i = 0; i < 2000000; i++) {
7373
secp256k1_scalar_negate(&data->scalar_x, &data->scalar_x);
@@ -76,7 +76,7 @@ void bench_scalar_negate(void* arg) {
7676

7777
void bench_scalar_sqr(void* arg) {
7878
int i;
79-
bench_inv_t *data = (bench_inv_t*)arg;
79+
bench_inv *data = (bench_inv*)arg;
8080

8181
for (i = 0; i < 200000; i++) {
8282
secp256k1_scalar_sqr(&data->scalar_x, &data->scalar_x);
@@ -85,7 +85,7 @@ void bench_scalar_sqr(void* arg) {
8585

8686
void bench_scalar_mul(void* arg) {
8787
int i;
88-
bench_inv_t *data = (bench_inv_t*)arg;
88+
bench_inv *data = (bench_inv*)arg;
8989

9090
for (i = 0; i < 200000; i++) {
9191
secp256k1_scalar_mul(&data->scalar_x, &data->scalar_x, &data->scalar_y);
@@ -95,7 +95,7 @@ void bench_scalar_mul(void* arg) {
9595
#ifdef USE_ENDOMORPHISM
9696
void bench_scalar_split(void* arg) {
9797
int i;
98-
bench_inv_t *data = (bench_inv_t*)arg;
98+
bench_inv *data = (bench_inv*)arg;
9999

100100
for (i = 0; i < 20000; i++) {
101101
secp256k1_scalar l, r;
@@ -107,7 +107,7 @@ void bench_scalar_split(void* arg) {
107107

108108
void bench_scalar_inverse(void* arg) {
109109
int i;
110-
bench_inv_t *data = (bench_inv_t*)arg;
110+
bench_inv *data = (bench_inv*)arg;
111111

112112
for (i = 0; i < 2000; i++) {
113113
secp256k1_scalar_inverse(&data->scalar_x, &data->scalar_x);
@@ -117,7 +117,7 @@ void bench_scalar_inverse(void* arg) {
117117

118118
void bench_scalar_inverse_var(void* arg) {
119119
int i;
120-
bench_inv_t *data = (bench_inv_t*)arg;
120+
bench_inv *data = (bench_inv*)arg;
121121

122122
for (i = 0; i < 2000; i++) {
123123
secp256k1_scalar_inverse_var(&data->scalar_x, &data->scalar_x);
@@ -127,7 +127,7 @@ void bench_scalar_inverse_var(void* arg) {
127127

128128
void bench_field_normalize(void* arg) {
129129
int i;
130-
bench_inv_t *data = (bench_inv_t*)arg;
130+
bench_inv *data = (bench_inv*)arg;
131131

132132
for (i = 0; i < 2000000; i++) {
133133
secp256k1_fe_normalize(&data->fe_x);
@@ -136,7 +136,7 @@ void bench_field_normalize(void* arg) {
136136

137137
void bench_field_normalize_weak(void* arg) {
138138
int i;
139-
bench_inv_t *data = (bench_inv_t*)arg;
139+
bench_inv *data = (bench_inv*)arg;
140140

141141
for (i = 0; i < 2000000; i++) {
142142
secp256k1_fe_normalize_weak(&data->fe_x);
@@ -145,7 +145,7 @@ void bench_field_normalize_weak(void* arg) {
145145

146146
void bench_field_mul(void* arg) {
147147
int i;
148-
bench_inv_t *data = (bench_inv_t*)arg;
148+
bench_inv *data = (bench_inv*)arg;
149149

150150
for (i = 0; i < 200000; i++) {
151151
secp256k1_fe_mul(&data->fe_x, &data->fe_x, &data->fe_y);
@@ -154,7 +154,7 @@ void bench_field_mul(void* arg) {
154154

155155
void bench_field_sqr(void* arg) {
156156
int i;
157-
bench_inv_t *data = (bench_inv_t*)arg;
157+
bench_inv *data = (bench_inv*)arg;
158158

159159
for (i = 0; i < 200000; i++) {
160160
secp256k1_fe_sqr(&data->fe_x, &data->fe_x);
@@ -163,7 +163,7 @@ void bench_field_sqr(void* arg) {
163163

164164
void bench_field_inverse(void* arg) {
165165
int i;
166-
bench_inv_t *data = (bench_inv_t*)arg;
166+
bench_inv *data = (bench_inv*)arg;
167167

168168
for (i = 0; i < 20000; i++) {
169169
secp256k1_fe_inv(&data->fe_x, &data->fe_x);
@@ -173,7 +173,7 @@ void bench_field_inverse(void* arg) {
173173

174174
void bench_field_inverse_var(void* arg) {
175175
int i;
176-
bench_inv_t *data = (bench_inv_t*)arg;
176+
bench_inv *data = (bench_inv*)arg;
177177

178178
for (i = 0; i < 20000; i++) {
179179
secp256k1_fe_inv_var(&data->fe_x, &data->fe_x);
@@ -183,7 +183,7 @@ void bench_field_inverse_var(void* arg) {
183183

184184
void bench_field_sqrt(void* arg) {
185185
int i;
186-
bench_inv_t *data = (bench_inv_t*)arg;
186+
bench_inv *data = (bench_inv*)arg;
187187

188188
for (i = 0; i < 20000; i++) {
189189
secp256k1_fe_sqrt(&data->fe_x, &data->fe_x);
@@ -193,7 +193,7 @@ void bench_field_sqrt(void* arg) {
193193

194194
void bench_group_double_var(void* arg) {
195195
int i;
196-
bench_inv_t *data = (bench_inv_t*)arg;
196+
bench_inv *data = (bench_inv*)arg;
197197

198198
for (i = 0; i < 200000; i++) {
199199
secp256k1_gej_double_var(&data->gej_x, &data->gej_x, NULL);
@@ -202,7 +202,7 @@ void bench_group_double_var(void* arg) {
202202

203203
void bench_group_add_var(void* arg) {
204204
int i;
205-
bench_inv_t *data = (bench_inv_t*)arg;
205+
bench_inv *data = (bench_inv*)arg;
206206

207207
for (i = 0; i < 200000; i++) {
208208
secp256k1_gej_add_var(&data->gej_x, &data->gej_x, &data->gej_y, NULL);
@@ -211,7 +211,7 @@ void bench_group_add_var(void* arg) {
211211

212212
void bench_group_add_affine(void* arg) {
213213
int i;
214-
bench_inv_t *data = (bench_inv_t*)arg;
214+
bench_inv *data = (bench_inv*)arg;
215215

216216
for (i = 0; i < 200000; i++) {
217217
secp256k1_gej_add_ge(&data->gej_x, &data->gej_x, &data->ge_y);
@@ -220,7 +220,7 @@ void bench_group_add_affine(void* arg) {
220220

221221
void bench_group_add_affine_var(void* arg) {
222222
int i;
223-
bench_inv_t *data = (bench_inv_t*)arg;
223+
bench_inv *data = (bench_inv*)arg;
224224

225225
for (i = 0; i < 200000; i++) {
226226
secp256k1_gej_add_ge_var(&data->gej_x, &data->gej_x, &data->ge_y, NULL);
@@ -229,7 +229,7 @@ void bench_group_add_affine_var(void* arg) {
229229

230230
void bench_group_jacobi_var(void* arg) {
231231
int i;
232-
bench_inv_t *data = (bench_inv_t*)arg;
232+
bench_inv *data = (bench_inv*)arg;
233233

234234
for (i = 0; i < 20000; i++) {
235235
secp256k1_gej_has_quad_y_var(&data->gej_x);
@@ -238,7 +238,7 @@ void bench_group_jacobi_var(void* arg) {
238238

239239
void bench_ecmult_wnaf(void* arg) {
240240
int i;
241-
bench_inv_t *data = (bench_inv_t*)arg;
241+
bench_inv *data = (bench_inv*)arg;
242242

243243
for (i = 0; i < 20000; i++) {
244244
secp256k1_ecmult_wnaf(data->wnaf, 256, &data->scalar_x, WINDOW_A);
@@ -248,7 +248,7 @@ void bench_ecmult_wnaf(void* arg) {
248248

249249
void bench_wnaf_const(void* arg) {
250250
int i;
251-
bench_inv_t *data = (bench_inv_t*)arg;
251+
bench_inv *data = (bench_inv*)arg;
252252

253253
for (i = 0; i < 20000; i++) {
254254
secp256k1_wnaf_const(data->wnaf, data->scalar_x, WINDOW_A);
@@ -259,8 +259,8 @@ void bench_wnaf_const(void* arg) {
259259

260260
void bench_sha256(void* arg) {
261261
int i;
262-
bench_inv_t *data = (bench_inv_t*)arg;
263-
secp256k1_sha256_t sha;
262+
bench_inv *data = (bench_inv*)arg;
263+
secp256k1_sha256 sha;
264264

265265
for (i = 0; i < 20000; i++) {
266266
secp256k1_sha256_initialize(&sha);
@@ -271,8 +271,8 @@ void bench_sha256(void* arg) {
271271

272272
void bench_hmac_sha256(void* arg) {
273273
int i;
274-
bench_inv_t *data = (bench_inv_t*)arg;
275-
secp256k1_hmac_sha256_t hmac;
274+
bench_inv *data = (bench_inv*)arg;
275+
secp256k1_hmac_sha256 hmac;
276276

277277
for (i = 0; i < 20000; i++) {
278278
secp256k1_hmac_sha256_initialize(&hmac, data->data, 32);
@@ -283,8 +283,8 @@ void bench_hmac_sha256(void* arg) {
283283

284284
void bench_rfc6979_hmac_sha256(void* arg) {
285285
int i;
286-
bench_inv_t *data = (bench_inv_t*)arg;
287-
secp256k1_rfc6979_hmac_sha256_t rng;
286+
bench_inv *data = (bench_inv*)arg;
287+
secp256k1_rfc6979_hmac_sha256 rng;
288288

289289
for (i = 0; i < 20000; i++) {
290290
secp256k1_rfc6979_hmac_sha256_initialize(&rng, data->data, 64);
@@ -311,7 +311,7 @@ void bench_context_sign(void* arg) {
311311
#ifndef USE_NUM_NONE
312312
void bench_num_jacobi(void* arg) {
313313
int i;
314-
bench_inv_t *data = (bench_inv_t*)arg;
314+
bench_inv *data = (bench_inv*)arg;
315315
secp256k1_num nx, norder;
316316

317317
secp256k1_scalar_get_num(&nx, &data->scalar_x);
@@ -340,7 +340,7 @@ int have_flag(int argc, char** argv, char *flag) {
340340
}
341341

342342
int main(int argc, char **argv) {
343-
bench_inv_t data;
343+
bench_inv data;
344344
if (have_flag(argc, argv, "scalar") || have_flag(argc, argv, "add")) run_benchmark("scalar_add", bench_scalar_add, bench_setup, NULL, &data, 10, 2000000);
345345
if (have_flag(argc, argv, "scalar") || have_flag(argc, argv, "negate")) run_benchmark("scalar_negate", bench_scalar_negate, bench_setup, NULL, &data, 10, 2000000);
346346
if (have_flag(argc, argv, "scalar") || have_flag(argc, argv, "sqr")) run_benchmark("scalar_sqr", bench_scalar_sqr, bench_setup, NULL, &data, 10, 200000);

‎src/bench_recover.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ typedef struct {
1313
secp256k1_context *ctx;
1414
unsigned char msg[32];
1515
unsigned char sig[64];
16-
} bench_recover_t;
16+
} bench_recover;
1717

1818
void bench_recover(void* arg) {
1919
int i;
20-
bench_recover_t *data = (bench_recover_t*)arg;
20+
bench_recover *data = (bench_recover*)arg;
2121
secp256k1_pubkey pubkey;
2222
unsigned char pubkeyc[33];
2323

@@ -38,7 +38,7 @@ void bench_recover(void* arg) {
3838

3939
void bench_recover_setup(void* arg) {
4040
int i;
41-
bench_recover_t *data = (bench_recover_t*)arg;
41+
bench_recover *data = (bench_recover*)arg;
4242

4343
for (i = 0; i < 32; i++) {
4444
data->msg[i] = 1 + i;
@@ -49,7 +49,7 @@ void bench_recover_setup(void* arg) {
4949
}
5050

5151
int main(void) {
52-
bench_recover_t data;
52+
bench_recover data;
5353

5454
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY);
5555

‎src/bench_sign.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ typedef struct {
1212
secp256k1_context* ctx;
1313
unsigned char msg[32];
1414
unsigned char key[32];
15-
} bench_sign_t;
15+
} bench_sign;
1616

1717
static void bench_sign_setup(void* arg) {
1818
int i;
19-
bench_sign_t *data = (bench_sign_t*)arg;
19+
bench_sign *data = (bench_sign*)arg;
2020

2121
for (i = 0; i < 32; i++) {
2222
data->msg[i] = i + 1;
@@ -26,9 +26,9 @@ static void bench_sign_setup(void* arg) {
2626
}
2727
}
2828

29-
static void bench_sign(void* arg) {
29+
static void bench_sign_run(void* arg) {
3030
int i;
31-
bench_sign_t *data = (bench_sign_t*)arg;
31+
bench_sign *data = (bench_sign*)arg;
3232

3333
unsigned char sig[74];
3434
for (i = 0; i < 20000; i++) {
@@ -45,11 +45,11 @@ static void bench_sign(void* arg) {
4545
}
4646

4747
int main(void) {
48-
bench_sign_t data;
48+
bench_sign data;
4949

5050
data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN);
5151

52-
run_benchmark("ecdsa_sign", bench_sign, bench_sign_setup, NULL, &data, 10, 20000);
52+
run_benchmark("ecdsa_sign", bench_sign_run, bench_sign_setup, NULL, &data, 10, 20000);
5353

5454
secp256k1_context_destroy(data.ctx);
5555
return 0;

‎src/ecmult_gen_impl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const
161161
secp256k1_gej gb;
162162
secp256k1_fe s;
163163
unsigned char nonce32[32];
164-
secp256k1_rfc6979_hmac_sha256_t rng;
164+
secp256k1_rfc6979_hmac_sha256 rng;
165165
int retry;
166166
unsigned char keydata[64] = {0};
167167
if (seed32 == NULL) {

0 commit comments

Comments
 (0)