@@ -121,7 +121,7 @@ static cx_err_t fe25519_cneg_sdk(fe25519_sdk h, const fe25519_sdk f, unsigned in
121121{
122122 fe25519_sdk negf ;
123123
124- CHECK_CXERROR (fe25519_neg_sdk (negf , f ))
124+ CHECK_CXERROR (fe25519_neg_sdk (negf , f ));
125125 fe25519_copy_sdk (h , f );
126126 fe25519_cmov_sdk (h , negf , b );
127127
@@ -153,29 +153,29 @@ static cx_err_t ristretto255_sqrt_ratio_m1_sdk(fe25519_sdk x, const fe25519_sdk
153153 fe25519_sdk x_sqrtm1 ;
154154 int has_p_root , has_f_root ;
155155
156- CHECK_CXERROR (fe25519_sq_sdk (v3 , v ))
157- CHECK_CXERROR (fe25519_mul_sdk (v3 , v3 , v )) /* v3 = v^3 */
158- CHECK_CXERROR (fe25519_sq_sdk (x , v3 ))
159- CHECK_CXERROR (fe25519_mul_sdk (x , x , u ))
160- CHECK_CXERROR (fe25519_mul_sdk (x , x , v )) /* x = uv^7 */
156+ CHECK_CXERROR (fe25519_sq_sdk (v3 , v ));
157+ CHECK_CXERROR (fe25519_mul_sdk (v3 , v3 , v )); /* v3 = v^3 */
158+ CHECK_CXERROR (fe25519_sq_sdk (x , v3 ));
159+ CHECK_CXERROR (fe25519_mul_sdk (x , x , u ));
160+ CHECK_CXERROR (fe25519_mul_sdk (x , x , v )); /* x = uv^7 */
161161
162- CHECK_CXERROR (fe25519_pow22523_sdk (x , x )) /* x = (uv^7)^((q-5)/8) */
163- CHECK_CXERROR (fe25519_mul_sdk (x , x , v3 ))
164- CHECK_CXERROR (fe25519_mul_sdk (x , x , u )) /* x = uv^3(uv^7)^((q-5)/8) */
162+ CHECK_CXERROR (fe25519_pow22523_sdk (x , x )); /* x = (uv^7)^((q-5)/8) */
163+ CHECK_CXERROR (fe25519_mul_sdk (x , x , v3 ));
164+ CHECK_CXERROR (fe25519_mul_sdk (x , x , u )); /* x = uv^3(uv^7)^((q-5)/8) */
165165
166- CHECK_CXERROR (fe25519_sq_sdk (vxx , x ))
167- CHECK_CXERROR (fe25519_mul_sdk (vxx , vxx , v )) /* vx^2 */
168- CHECK_CXERROR (fe25519_sub_sdk (m_root_check , vxx , u )) /* vx^2-u */
169- CHECK_CXERROR (fe25519_add_sdk (p_root_check , vxx , u )) /* vx^2+u */
170- CHECK_CXERROR (fe25519_mul_sdk (f_root_check , u , fe25519_sqrtm1_sdk )) /* u*sqrt(-1) */
171- CHECK_CXERROR (fe25519_add_sdk (f_root_check , vxx , f_root_check )) /* vx^2+u*sqrt(-1) */
166+ CHECK_CXERROR (fe25519_sq_sdk (vxx , x ));
167+ CHECK_CXERROR (fe25519_mul_sdk (vxx , vxx , v )); /* vx^2 */
168+ CHECK_CXERROR (fe25519_sub_sdk (m_root_check , vxx , u )); /* vx^2-u */
169+ CHECK_CXERROR (fe25519_add_sdk (p_root_check , vxx , u )); /* vx^2+u */
170+ CHECK_CXERROR (fe25519_mul_sdk (f_root_check , u , fe25519_sqrtm1_sdk )); /* u*sqrt(-1) */
171+ CHECK_CXERROR (fe25519_add_sdk (f_root_check , vxx , f_root_check )); /* vx^2+u*sqrt(-1) */
172172
173173 has_p_root = fe25519_iszero_sdk (p_root_check );
174174 has_f_root = fe25519_iszero_sdk (f_root_check );
175- CHECK_CXERROR (fe25519_mul_sdk (x_sqrtm1 ,x , fe25519_sqrtm1_sdk ))
175+ CHECK_CXERROR (fe25519_mul_sdk (x_sqrtm1 ,x , fe25519_sqrtm1_sdk ));
176176
177177 fe25519_cmov_sdk (x , x_sqrtm1 , has_p_root | has_f_root );
178- CHECK_CXERROR (fe25519_abs_sdk (x , x ))
178+ CHECK_CXERROR (fe25519_abs_sdk (x , x ));
179179
180180 return CX_OK ;
181181}
@@ -198,28 +198,28 @@ static cx_err_t ristretto255_p3_tobytes_sdk(fe25519_sdk s, const ge25519_p3_sdk
198198 fe25519_sdk zmy ;
199199 int rotate ;
200200
201- CHECK_CXERROR (fe25519_add_sdk (u1 , h -> Z , h -> Y )) /* u1 = Z+Y */
202- CHECK_CXERROR (fe25519_sub_sdk (zmy , h -> Z , h -> Y )) /* zmy = Z-Y */
203- CHECK_CXERROR (fe25519_mul_sdk (u1 , u1 , zmy )) /* u1 = (Z+Y)*(Z-Y) */
204- CHECK_CXERROR (fe25519_mul_sdk (u2 , h -> X , h -> Y )) /* u2 = X*Y */
201+ CHECK_CXERROR (fe25519_add_sdk (u1 , h -> Z , h -> Y )); /* u1 = Z+Y */
202+ CHECK_CXERROR (fe25519_sub_sdk (zmy , h -> Z , h -> Y )); /* zmy = Z-Y */
203+ CHECK_CXERROR (fe25519_mul_sdk (u1 , u1 , zmy )); /* u1 = (Z+Y)*(Z-Y) */
204+ CHECK_CXERROR (fe25519_mul_sdk (u2 , h -> X , h -> Y )); /* u2 = X*Y */
205205
206- CHECK_CXERROR (fe25519_sq_sdk (u1_u2u2 , u2 )) /* u1_u2u2 = u2^2 */
207- CHECK_CXERROR (fe25519_mul_sdk (u1_u2u2 , u1 , u1_u2u2 )) /* u1_u2u2 = u1*u2^2 */
206+ CHECK_CXERROR (fe25519_sq_sdk (u1_u2u2 , u2 )); /* u1_u2u2 = u2^2 */
207+ CHECK_CXERROR (fe25519_mul_sdk (u1_u2u2 , u1 , u1_u2u2 )); /* u1_u2u2 = u1*u2^2 */
208208
209209 fe25519_1_sdk (one );
210- CHECK_CXERROR (ristretto255_sqrt_ratio_m1_sdk (inv_sqrt , one , u1_u2u2 ))
210+ CHECK_CXERROR (ristretto255_sqrt_ratio_m1_sdk (inv_sqrt , one , u1_u2u2 ));
211211
212- CHECK_CXERROR (fe25519_mul_sdk (den1 , inv_sqrt , u1 ))
213- CHECK_CXERROR (fe25519_mul_sdk (den2 , inv_sqrt , u2 ))
214- CHECK_CXERROR (fe25519_mul_sdk (z_inv , den1 , den2 ))
215- CHECK_CXERROR (fe25519_mul_sdk (z_inv , z_inv , h - > T ))
212+ CHECK_CXERROR (fe25519_mul_sdk (den1 , inv_sqrt , u1 ));
213+ CHECK_CXERROR (fe25519_mul_sdk (den2 , inv_sqrt , u2 ));
214+ CHECK_CXERROR (fe25519_mul_sdk (z_inv , den1 , den2 ));
215+ CHECK_CXERROR (fe25519_mul_sdk (z_inv , z_inv , h -> T ));
216216
217- CHECK_CXERROR (fe25519_mul_sdk (ix , h - > X , fe25519_sqrtm1_sdk ))
218- CHECK_CXERROR (fe25519_mul_sdk (iy , h - > Y , fe25519_sqrtm1_sdk ))
217+ CHECK_CXERROR (fe25519_mul_sdk (ix , h -> X , fe25519_sqrtm1_sdk ));
218+ CHECK_CXERROR (fe25519_mul_sdk (iy , h -> Y , fe25519_sqrtm1_sdk ));
219219
220- CHECK_CXERROR (fe25519_mul_sdk (eden , den1 , ed25519_invsqrtamd_sdk ))
220+ CHECK_CXERROR (fe25519_mul_sdk (eden , den1 , ed25519_invsqrtamd_sdk ));
221221
222- CHECK_CXERROR (fe25519_mul_sdk (t_z_inv , h - > T , z_inv ))
222+ CHECK_CXERROR (fe25519_mul_sdk (t_z_inv , h -> T , z_inv ));
223223 rotate = fe25519_isnegative_sdk (t_z_inv );
224224
225225 fe25519_copy_sdk (x_ , h -> X );
@@ -231,12 +231,12 @@ static cx_err_t ristretto255_p3_tobytes_sdk(fe25519_sdk s, const ge25519_p3_sdk
231231 fe25519_cmov_sdk (y_ , ix , rotate );
232232 fe25519_cmov_sdk (den_inv , eden , rotate );
233233
234- CHECK_CXERROR (fe25519_mul_sdk (x_z_inv , x_ , z_inv ))
235- CHECK_CXERROR (fe25519_cneg_sdk (y_ , y_ , fe25519_isnegative_sdk (x_z_inv )))
234+ CHECK_CXERROR (fe25519_mul_sdk (x_z_inv , x_ , z_inv ));
235+ CHECK_CXERROR (fe25519_cneg_sdk (y_ , y_ , fe25519_isnegative_sdk (x_z_inv )));;
236236
237- CHECK_CXERROR (fe25519_sub_sdk (s_ , h - > Z , y_ ))
238- CHECK_CXERROR (fe25519_mul_sdk (s_ , den_inv , s_ ))
239- CHECK_CXERROR (fe25519_abs_sdk (s , s_ ))
237+ CHECK_CXERROR (fe25519_sub_sdk (s_ , h -> Z , y_ ));
238+ CHECK_CXERROR (fe25519_mul_sdk (s_ , den_inv , s_ ));
239+ CHECK_CXERROR (fe25519_abs_sdk (s , s_ ));
240240
241241 return CX_OK ;
242242}
@@ -253,18 +253,18 @@ cx_err_t crypto_scalarmult_ristretto255_base_sdk(unsigned char *q,const unsigned
253253
254254 uint8_t Pxy [ED25519_SDKPOINT_BYTES ];
255255 memcpy (Pxy , ED25519_GEN , sizeof (Pxy ));
256- CHECK_CXERROR (cx_ecfp_scalar_mult_no_throw (CX_CURVE_Ed25519 , Pxy , t , ED25519_SCALAR_BYTES ))
256+ CHECK_CXERROR (cx_ecfp_scalar_mult_no_throw (CX_CURVE_Ed25519 , Pxy , t , ED25519_SCALAR_BYTES ));
257257
258258 ge25519_p3_sdk Q_sdk ;
259259 MEMZERO (& Q_sdk , sizeof (ge25519_p3_sdk ));
260260 memcpy (Q_sdk .X , & Pxy [1 ],ED25519_SCALAR_BYTES );
261261 memcpy (Q_sdk .Y , & Pxy [1 + ED25519_SCALAR_BYTES ],ED25519_SCALAR_BYTES );
262262 fe25519_1_sdk (Q_sdk .Z );
263- CHECK_CXERROR (fe25519_mul_sdk (Q_sdk .T , Q_sdk .X ,Q_sdk .Y ))
263+ CHECK_CXERROR (fe25519_mul_sdk (Q_sdk .T , Q_sdk .X ,Q_sdk .Y ));
264264
265265 fe25519_sdk s ;
266266
267- CHECK_CXERROR (ristretto255_p3_tobytes_sdk (s , & Q_sdk ))
267+ CHECK_CXERROR (ristretto255_p3_tobytes_sdk (s , & Q_sdk ));
268268
269269 if (fe25519_iszero_sdk (s )) {
270270 return CX_INTERNAL_ERROR ;
0 commit comments