@@ -96,7 +96,7 @@ static void uncounting_illegal_callback_fn(const char* str, void* data) {
96
96
(* p )-- ;
97
97
}
98
98
99
- static void random_field_element_magnitude (secp256k1_fe * fe , int m ) {
99
+ static void random_fe_magnitude (secp256k1_fe * fe , int m ) {
100
100
secp256k1_fe zero ;
101
101
int n = secp256k1_testrand_int (m + 1 );
102
102
secp256k1_fe_normalize (fe );
@@ -128,28 +128,24 @@ static void random_fe_non_zero_test(secp256k1_fe *fe) {
128
128
} while (secp256k1_fe_is_zero (fe ));
129
129
}
130
130
131
- static void random_fe_magnitude (secp256k1_fe * fe ) {
132
- random_field_element_magnitude (fe , 8 );
133
- }
134
-
135
131
static void random_ge_x_magnitude (secp256k1_ge * ge ) {
136
- random_field_element_magnitude (& ge -> x , SECP256K1_GE_X_MAGNITUDE_MAX );
132
+ random_fe_magnitude (& ge -> x , SECP256K1_GE_X_MAGNITUDE_MAX );
137
133
}
138
134
139
135
static void random_ge_y_magnitude (secp256k1_ge * ge ) {
140
- random_field_element_magnitude (& ge -> y , SECP256K1_GE_Y_MAGNITUDE_MAX );
136
+ random_fe_magnitude (& ge -> y , SECP256K1_GE_Y_MAGNITUDE_MAX );
141
137
}
142
138
143
139
static void random_gej_x_magnitude (secp256k1_gej * gej ) {
144
- random_field_element_magnitude (& gej -> x , SECP256K1_GEJ_X_MAGNITUDE_MAX );
140
+ random_fe_magnitude (& gej -> x , SECP256K1_GEJ_X_MAGNITUDE_MAX );
145
141
}
146
142
147
143
static void random_gej_y_magnitude (secp256k1_gej * gej ) {
148
- random_field_element_magnitude (& gej -> y , SECP256K1_GEJ_Y_MAGNITUDE_MAX );
144
+ random_fe_magnitude (& gej -> y , SECP256K1_GEJ_Y_MAGNITUDE_MAX );
149
145
}
150
146
151
147
static void random_gej_z_magnitude (secp256k1_gej * gej ) {
152
- random_field_element_magnitude (& gej -> z , SECP256K1_GEJ_Z_MAGNITUDE_MAX );
148
+ random_fe_magnitude (& gej -> z , SECP256K1_GEJ_Z_MAGNITUDE_MAX );
153
149
}
154
150
155
151
static void random_ge_test (secp256k1_ge * ge ) {
@@ -3269,13 +3265,13 @@ static void run_fe_mul(void) {
3269
3265
for (i = 0 ; i < 100 * COUNT ; ++ i ) {
3270
3266
secp256k1_fe a , b , c , d ;
3271
3267
random_fe (& a );
3272
- random_fe_magnitude (& a );
3268
+ random_fe_magnitude (& a , 8 );
3273
3269
random_fe (& b );
3274
- random_fe_magnitude (& b );
3270
+ random_fe_magnitude (& b , 8 );
3275
3271
random_fe_test (& c );
3276
- random_fe_magnitude (& c );
3272
+ random_fe_magnitude (& c , 8 );
3277
3273
random_fe_test (& d );
3278
- random_fe_magnitude (& d );
3274
+ random_fe_magnitude (& d , 8 );
3279
3275
test_fe_mul (& a , & a , 1 );
3280
3276
test_fe_mul (& c , & c , 1 );
3281
3277
test_fe_mul (& a , & b , 0 );
@@ -3829,7 +3825,7 @@ static void test_ge(void) {
3829
3825
3830
3826
/* Generate random zf, and zfi2 = 1/zf^2, zfi3 = 1/zf^3 */
3831
3827
random_fe_non_zero_test (& zf );
3832
- random_fe_magnitude (& zf );
3828
+ random_fe_magnitude (& zf , 8 );
3833
3829
secp256k1_fe_inv_var (& zfi3 , & zf );
3834
3830
secp256k1_fe_sqr (& zfi2 , & zfi3 );
3835
3831
secp256k1_fe_mul (& zfi3 , & zfi3 , & zfi2 );
0 commit comments