@@ -169,29 +169,29 @@ static void secp256k1_scalar_cadd_bit(secp256k1_scalar *r, unsigned int bit, int
169
169
170
170
static void secp256k1_scalar_set_b32 (secp256k1_scalar * r , const unsigned char * b32 , int * overflow ) {
171
171
int over ;
172
- r -> d [0 ] = ( uint32_t ) b32 [31 ] | ( uint32_t ) b32 [ 30 ] << 8 | ( uint32_t ) b32 [ 29 ] << 16 | ( uint32_t ) b32 [ 28 ] << 24 ;
173
- r -> d [1 ] = ( uint32_t ) b32 [27 ] | ( uint32_t ) b32 [ 26 ] << 8 | ( uint32_t ) b32 [ 25 ] << 16 | ( uint32_t ) b32 [ 24 ] << 24 ;
174
- r -> d [2 ] = ( uint32_t ) b32 [23 ] | ( uint32_t ) b32 [ 22 ] << 8 | ( uint32_t ) b32 [ 21 ] << 16 | ( uint32_t ) b32 [ 20 ] << 24 ;
175
- r -> d [3 ] = ( uint32_t ) b32 [19 ] | ( uint32_t ) b32 [ 18 ] << 8 | ( uint32_t ) b32 [ 17 ] << 16 | ( uint32_t ) b32 [ 16 ] << 24 ;
176
- r -> d [4 ] = ( uint32_t ) b32 [15 ] | ( uint32_t ) b32 [ 14 ] << 8 | ( uint32_t ) b32 [ 13 ] << 16 | ( uint32_t ) b32 [ 12 ] << 24 ;
177
- r -> d [5 ] = ( uint32_t ) b32 [11 ] | ( uint32_t ) b32 [ 10 ] << 8 | ( uint32_t ) b32 [ 9 ] << 16 | ( uint32_t ) b32 [ 8 ] << 24 ;
178
- r -> d [6 ] = ( uint32_t ) b32 [7 ] | ( uint32_t ) b32 [ 6 ] << 8 | ( uint32_t ) b32 [ 5 ] << 16 | ( uint32_t ) b32 [ 4 ] << 24 ;
179
- r -> d [7 ] = ( uint32_t ) b32 [3 ] | ( uint32_t ) b32 [ 2 ] << 8 | ( uint32_t ) b32 [ 1 ] << 16 | ( uint32_t ) b32 [ 0 ] << 24 ;
172
+ r -> d [0 ] = secp256k1_read_be32 ( & b32 [28 ]) ;
173
+ r -> d [1 ] = secp256k1_read_be32 ( & b32 [24 ]) ;
174
+ r -> d [2 ] = secp256k1_read_be32 ( & b32 [20 ]) ;
175
+ r -> d [3 ] = secp256k1_read_be32 ( & b32 [16 ]) ;
176
+ r -> d [4 ] = secp256k1_read_be32 ( & b32 [12 ]) ;
177
+ r -> d [5 ] = secp256k1_read_be32 ( & b32 [8 ]) ;
178
+ r -> d [6 ] = secp256k1_read_be32 ( & b32 [4 ]) ;
179
+ r -> d [7 ] = secp256k1_read_be32 ( & b32 [0 ]) ;
180
180
over = secp256k1_scalar_reduce (r , secp256k1_scalar_check_overflow (r ));
181
181
if (overflow ) {
182
182
* overflow = over ;
183
183
}
184
184
}
185
185
186
186
static void secp256k1_scalar_get_b32 (unsigned char * bin , const secp256k1_scalar * a ) {
187
- bin [0 ] = a -> d [7 ] >> 24 ; bin [ 1 ] = a -> d [ 7 ] >> 16 ; bin [ 2 ] = a -> d [ 7 ] >> 8 ; bin [ 3 ] = a -> d [ 7 ] ;
188
- bin [4 ] = a -> d [6 ] >> 24 ; bin [ 5 ] = a -> d [ 6 ] >> 16 ; bin [ 6 ] = a -> d [ 6 ] >> 8 ; bin [ 7 ] = a -> d [ 6 ] ;
189
- bin [8 ] = a -> d [5 ] >> 24 ; bin [ 9 ] = a -> d [ 5 ] >> 16 ; bin [ 10 ] = a -> d [ 5 ] >> 8 ; bin [ 11 ] = a -> d [ 5 ] ;
190
- bin [12 ] = a -> d [4 ] >> 24 ; bin [ 13 ] = a -> d [ 4 ] >> 16 ; bin [ 14 ] = a -> d [ 4 ] >> 8 ; bin [ 15 ] = a -> d [ 4 ] ;
191
- bin [16 ] = a -> d [3 ] >> 24 ; bin [ 17 ] = a -> d [ 3 ] >> 16 ; bin [ 18 ] = a -> d [ 3 ] >> 8 ; bin [ 19 ] = a -> d [ 3 ] ;
192
- bin [20 ] = a -> d [2 ] >> 24 ; bin [ 21 ] = a -> d [ 2 ] >> 16 ; bin [ 22 ] = a -> d [ 2 ] >> 8 ; bin [ 23 ] = a -> d [ 2 ] ;
193
- bin [24 ] = a -> d [1 ] >> 24 ; bin [ 25 ] = a -> d [ 1 ] >> 16 ; bin [ 26 ] = a -> d [ 1 ] >> 8 ; bin [ 27 ] = a -> d [ 1 ] ;
194
- bin [28 ] = a -> d [0 ] >> 24 ; bin [ 29 ] = a -> d [ 0 ] >> 16 ; bin [ 30 ] = a -> d [ 0 ] >> 8 ; bin [ 31 ] = a -> d [ 0 ] ;
187
+ secp256k1_write_be32 ( & bin [0 ], a -> d [7 ]) ;
188
+ secp256k1_write_be32 ( & bin [4 ], a -> d [6 ]) ;
189
+ secp256k1_write_be32 ( & bin [8 ], a -> d [5 ]) ;
190
+ secp256k1_write_be32 ( & bin [12 ], a -> d [4 ]) ;
191
+ secp256k1_write_be32 ( & bin [16 ], a -> d [3 ]) ;
192
+ secp256k1_write_be32 ( & bin [20 ], a -> d [2 ]) ;
193
+ secp256k1_write_be32 ( & bin [24 ], a -> d [1 ]) ;
194
+ secp256k1_write_be32 ( & bin [28 ], a -> d [0 ]) ;
195
195
}
196
196
197
197
SECP256K1_INLINE static int secp256k1_scalar_is_zero (const secp256k1_scalar * a ) {
0 commit comments