@@ -133,21 +133,21 @@ static void secp256k1_scalar_cadd_bit(secp256k1_scalar *r, unsigned int bit, int
133
133
134
134
static void secp256k1_scalar_set_b32 (secp256k1_scalar * r , const unsigned char * b32 , int * overflow ) {
135
135
int over ;
136
- r -> d [0 ] = (uint64_t ) b32 [ 31 ] | (uint64_t )b32 [ 30 ] << 8 | ( uint64_t ) b32 [29 ] << 16 | ( uint64_t ) b32 [ 28 ] << 24 | ( uint64_t ) b32 [ 27 ] << 32 | ( uint64_t ) b32 [ 26 ] << 40 | (uint64_t )b32 [ 25 ] << 48 | ( uint64_t ) b32 [24 ] << 56 ;
137
- r -> d [1 ] = (uint64_t ) b32 [ 23 ] | (uint64_t )b32 [ 22 ] << 8 | ( uint64_t ) b32 [21 ] << 16 | ( uint64_t ) b32 [ 20 ] << 24 | ( uint64_t ) b32 [ 19 ] << 32 | ( uint64_t ) b32 [ 18 ] << 40 | (uint64_t )b32 [ 17 ] << 48 | ( uint64_t ) b32 [16 ] << 56 ;
138
- r -> d [2 ] = (uint64_t ) b32 [ 15 ] | (uint64_t )b32 [ 14 ] << 8 | ( uint64_t ) b32 [13 ] << 16 | ( uint64_t ) b32 [ 12 ] << 24 | ( uint64_t ) b32 [ 11 ] << 32 | ( uint64_t ) b32 [ 10 ] << 40 | (uint64_t )b32 [ 9 ] << 48 | ( uint64_t ) b32 [8 ] << 56 ;
139
- r -> d [3 ] = (uint64_t ) b32 [ 7 ] | (uint64_t )b32 [ 6 ] << 8 | ( uint64_t ) b32 [5 ] << 16 | ( uint64_t ) b32 [ 4 ] << 24 | ( uint64_t ) b32 [ 3 ] << 32 | ( uint64_t ) b32 [ 2 ] << 40 | (uint64_t )b32 [ 1 ] << 48 | ( uint64_t ) b32 [0 ] << 56 ;
136
+ r -> d [0 ] = ((uint64_t )secp256k1_read_be32 ( & b32 [24 ]) << 32 ) | (uint64_t )secp256k1_read_be32 ( & b32 [28 ]) ;
137
+ r -> d [1 ] = ((uint64_t )secp256k1_read_be32 ( & b32 [16 ]) << 32 ) | (uint64_t )secp256k1_read_be32 ( & b32 [20 ]) ;
138
+ r -> d [2 ] = ((uint64_t )secp256k1_read_be32 ( & b32 [8 ]) << 32 ) | (uint64_t )secp256k1_read_be32 ( & b32 [12 ]) ;
139
+ r -> d [3 ] = ((uint64_t )secp256k1_read_be32 ( & b32 [0 ]) << 32 ) | (uint64_t )secp256k1_read_be32 ( & b32 [4 ]) ;
140
140
over = secp256k1_scalar_reduce (r , secp256k1_scalar_check_overflow (r ));
141
141
if (overflow ) {
142
142
* overflow = over ;
143
143
}
144
144
}
145
145
146
146
static void secp256k1_scalar_get_b32 (unsigned char * bin , const secp256k1_scalar * a ) {
147
- bin [0 ] = a -> d [3 ] >> 56 ; bin [ 1 ] = a -> d [ 3 ] >> 48 ; bin [ 2 ] = a -> d [ 3 ] >> 40 ; bin [ 3 ] = a -> d [ 3 ] >> 32 ; bin [4 ] = a -> d [3 ] >> 24 ; bin [ 5 ] = a -> d [ 3 ] >> 16 ; bin [ 6 ] = a -> d [ 3 ] >> 8 ; bin [ 7 ] = a -> d [ 3 ] ;
148
- bin [8 ] = a -> d [2 ] >> 56 ; bin [ 9 ] = a -> d [ 2 ] >> 48 ; bin [ 10 ] = a -> d [ 2 ] >> 40 ; bin [ 11 ] = a -> d [ 2 ] >> 32 ; bin [12 ] = a -> d [2 ] >> 24 ; bin [ 13 ] = a -> d [ 2 ] >> 16 ; bin [ 14 ] = a -> d [ 2 ] >> 8 ; bin [ 15 ] = a -> d [ 2 ] ;
149
- bin [16 ] = a -> d [1 ] >> 56 ; bin [ 17 ] = a -> d [ 1 ] >> 48 ; bin [ 18 ] = a -> d [ 1 ] >> 40 ; bin [ 19 ] = a -> d [ 1 ] >> 32 ; bin [20 ] = a -> d [1 ] >> 24 ; bin [ 21 ] = a -> d [ 1 ] >> 16 ; bin [ 22 ] = a -> d [ 1 ] >> 8 ; bin [ 23 ] = a -> d [ 1 ] ;
150
- bin [24 ] = a -> d [0 ] >> 56 ; bin [ 25 ] = a -> d [ 0 ] >> 48 ; bin [ 26 ] = a -> d [ 0 ] >> 40 ; bin [ 27 ] = a -> d [ 0 ] >> 32 ; bin [28 ] = a -> d [0 ] >> 24 ; bin [ 29 ] = a -> d [ 0 ] >> 16 ; bin [ 30 ] = a -> d [ 0 ] >> 8 ; bin [ 31 ] = a -> d [ 0 ] ;
147
+ secp256k1_write_be32 ( & bin [0 ], a -> d [3 ] >> 32 ); secp256k1_write_be32 ( & bin [4 ], a -> d [3 ]) ;
148
+ secp256k1_write_be32 ( & bin [8 ], a -> d [2 ] >> 32 ); secp256k1_write_be32 ( & bin [12 ], a -> d [2 ]) ;
149
+ secp256k1_write_be32 ( & bin [16 ], a -> d [1 ] >> 32 ); secp256k1_write_be32 ( & bin [20 ], a -> d [1 ]) ;
150
+ secp256k1_write_be32 ( & bin [24 ], a -> d [0 ] >> 32 ); secp256k1_write_be32 ( & bin [28 ], a -> d [0 ]) ;
151
151
}
152
152
153
153
SECP256K1_INLINE static int secp256k1_scalar_is_zero (const secp256k1_scalar * a ) {
0 commit comments