File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change 1
- use std:: fmt;
1
+ use std:: { fmt, convert :: TryInto } ;
2
2
3
3
const H0 : u32 = 0x67452301 ;
4
4
const H1 : u32 = 0xEFCDAB89 ;
@@ -184,7 +184,7 @@ fn process_block(blk: &mut Sha1State, dat: [u32;16]) {
184
184
blk. e = blk. e . wrapping_add ( v. e ) ;
185
185
}
186
186
187
- fn to_u32x16 ( v : & [ u8 ] ) -> [ u32 ; 16 ] {
187
+ fn to_u32x16 ( v : & [ u8 ; 64 ] ) -> [ u32 ; 16 ] {
188
188
let mut res: [ u32 ; 16 ] = [ 0 ; 16 ] ;
189
189
for i in 0 ..16 {
190
190
res[ i] = ( ( v[ i* 4 ] as u32 ) << 24 ) | ( ( v[ i* 4 + 1 ] as u32 ) << 16 ) | ( ( v[ i* 4 + 2 ] as u32 ) << 8 ) | ( v[ i* 4 + 3 ] as u32 ) ;
@@ -200,15 +200,15 @@ pub fn sha1(dat: &[u8]) -> Sha1State {
200
200
let mut off: usize = 0 ;
201
201
202
202
while off + 64 <= len {
203
- process_block ( & mut res, to_u32x16 ( & dat[ off..off + 64 ] ) ) ;
203
+ process_block ( & mut res, to_u32x16 ( dat[ off..off + 64 ] . try_into ( ) . unwrap ( ) ) ) ;
204
204
off += 64 ;
205
205
}
206
206
let mut pad: [ u8 ; 64 ] = [ 0 ; 64 ] ;
207
207
for i in off..len {
208
208
pad[ i - off] = dat[ i] ;
209
209
}
210
210
pad[ len - off] = 0x80 ;
211
- let mut padu32 = to_u32x16 ( & pad[ .. ] ) ;
211
+ let mut padu32 = to_u32x16 ( & pad) ;
212
212
213
213
let lenh = ( ( len * 8 ) >> 32 ) as u32 ;
214
214
let lenl = ( ( len * 8 ) & 0xffff_ffff ) as u32 ;
You can’t perform that action at this time.
0 commit comments