@@ -58,49 +58,49 @@ use std::mem;
58
58
#[ inline]
59
59
pub fn sha1 ( data : & [ u8 ] ) -> [ u8 ; 20 ] {
60
60
unsafe {
61
- let mut hash: [ u8 ; 20 ] = mem:: uninitialized ( ) ;
62
- ffi:: SHA1 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) ) ;
63
- hash
61
+ let mut hash: mem :: MaybeUninit < [ u8 ; 20 ] > = mem:: MaybeUninit :: uninit ( ) ;
62
+ ffi:: SHA1 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) as * mut u8 ) ;
63
+ hash. assume_init ( )
64
64
}
65
65
}
66
66
67
67
/// Computes the SHA224 hash of some data.
68
68
#[ inline]
69
69
pub fn sha224 ( data : & [ u8 ] ) -> [ u8 ; 28 ] {
70
70
unsafe {
71
- let mut hash: [ u8 ; 28 ] = mem:: uninitialized ( ) ;
72
- ffi:: SHA224 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) ) ;
73
- hash
71
+ let mut hash: mem :: MaybeUninit < [ u8 ; 28 ] > = mem:: MaybeUninit :: uninit ( ) ;
72
+ ffi:: SHA224 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) as * mut u8 ) ;
73
+ hash. assume_init ( )
74
74
}
75
75
}
76
76
77
77
/// Computes the SHA256 hash of some data.
78
78
#[ inline]
79
79
pub fn sha256 ( data : & [ u8 ] ) -> [ u8 ; 32 ] {
80
80
unsafe {
81
- let mut hash: [ u8 ; 32 ] = mem:: uninitialized ( ) ;
82
- ffi:: SHA256 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) ) ;
83
- hash
81
+ let mut hash: mem :: MaybeUninit < [ u8 ; 32 ] > = mem:: MaybeUninit :: uninit ( ) ;
82
+ ffi:: SHA256 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) as * mut u8 ) ;
83
+ hash. assume_init ( )
84
84
}
85
85
}
86
86
87
87
/// Computes the SHA384 hash of some data.
88
88
#[ inline]
89
89
pub fn sha384 ( data : & [ u8 ] ) -> [ u8 ; 48 ] {
90
90
unsafe {
91
- let mut hash: [ u8 ; 48 ] = mem:: uninitialized ( ) ;
92
- ffi:: SHA384 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) ) ;
93
- hash
91
+ let mut hash: mem :: MaybeUninit < [ u8 ; 48 ] > = mem:: MaybeUninit :: uninit ( ) ;
92
+ ffi:: SHA384 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) as * mut u8 ) ;
93
+ hash. assume_init ( )
94
94
}
95
95
}
96
96
97
97
/// Computes the SHA512 hash of some data.
98
98
#[ inline]
99
99
pub fn sha512 ( data : & [ u8 ] ) -> [ u8 ; 64 ] {
100
100
unsafe {
101
- let mut hash: [ u8 ; 64 ] = mem:: uninitialized ( ) ;
102
- ffi:: SHA512 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) ) ;
103
- hash
101
+ let mut hash: mem :: MaybeUninit < [ u8 ; 64 ] > = mem:: MaybeUninit :: uninit ( ) ;
102
+ ffi:: SHA512 ( data. as_ptr ( ) , data. len ( ) , hash. as_mut_ptr ( ) as * mut u8 ) ;
103
+ hash. assume_init ( )
104
104
}
105
105
}
106
106
@@ -118,9 +118,9 @@ impl Sha1 {
118
118
#[ inline]
119
119
pub fn new ( ) -> Sha1 {
120
120
unsafe {
121
- let mut ctx = mem:: uninitialized ( ) ;
122
- ffi:: SHA1_Init ( & mut ctx) ;
123
- Sha1 ( ctx)
121
+ let mut ctx: mem :: MaybeUninit < ffi :: SHA_CTX > = mem:: MaybeUninit :: uninit ( ) ;
122
+ ffi:: SHA1_Init ( ctx. as_mut_ptr ( ) ) ;
123
+ Sha1 ( ctx. assume_init ( ) )
124
124
}
125
125
}
126
126
@@ -138,9 +138,9 @@ impl Sha1 {
138
138
#[ inline]
139
139
pub fn finish ( mut self ) -> [ u8 ; 20 ] {
140
140
unsafe {
141
- let mut hash: [ u8 ; 20 ] = mem:: uninitialized ( ) ;
142
- ffi:: SHA1_Final ( hash. as_mut_ptr ( ) , & mut self . 0 ) ;
143
- hash
141
+ let mut hash: mem :: MaybeUninit < [ u8 ; 20 ] > = mem:: MaybeUninit :: uninit ( ) ;
142
+ ffi:: SHA1_Final ( hash. as_mut_ptr ( ) as * mut u8 , & mut self . 0 ) ;
143
+ hash. assume_init ( )
144
144
}
145
145
}
146
146
}
@@ -154,9 +154,9 @@ impl Sha224 {
154
154
#[ inline]
155
155
pub fn new ( ) -> Sha224 {
156
156
unsafe {
157
- let mut ctx = mem:: uninitialized ( ) ;
158
- ffi:: SHA224_Init ( & mut ctx) ;
159
- Sha224 ( ctx)
157
+ let mut ctx: mem :: MaybeUninit < ffi :: SHA256_CTX > = mem:: MaybeUninit :: uninit ( ) ;
158
+ ffi:: SHA224_Init ( ctx. as_mut_ptr ( ) ) ;
159
+ Sha224 ( ctx. assume_init ( ) )
160
160
}
161
161
}
162
162
@@ -174,9 +174,9 @@ impl Sha224 {
174
174
#[ inline]
175
175
pub fn finish ( mut self ) -> [ u8 ; 28 ] {
176
176
unsafe {
177
- let mut hash: [ u8 ; 28 ] = mem:: uninitialized ( ) ;
178
- ffi:: SHA224_Final ( hash. as_mut_ptr ( ) , & mut self . 0 ) ;
179
- hash
177
+ let mut hash: mem :: MaybeUninit < [ u8 ; 28 ] > = mem:: MaybeUninit :: uninit ( ) ;
178
+ ffi:: SHA224_Final ( hash. as_mut_ptr ( ) as * mut u8 , & mut self . 0 ) ;
179
+ hash. assume_init ( )
180
180
}
181
181
}
182
182
}
@@ -190,9 +190,9 @@ impl Sha256 {
190
190
#[ inline]
191
191
pub fn new ( ) -> Sha256 {
192
192
unsafe {
193
- let mut ctx = mem:: uninitialized ( ) ;
194
- ffi:: SHA256_Init ( & mut ctx) ;
195
- Sha256 ( ctx)
193
+ let mut ctx: mem :: MaybeUninit < ffi :: SHA256_CTX > = mem:: MaybeUninit :: uninit ( ) ;
194
+ ffi:: SHA256_Init ( ctx. as_mut_ptr ( ) ) ;
195
+ Sha256 ( ctx. assume_init ( ) )
196
196
}
197
197
}
198
198
@@ -210,9 +210,9 @@ impl Sha256 {
210
210
#[ inline]
211
211
pub fn finish ( mut self ) -> [ u8 ; 32 ] {
212
212
unsafe {
213
- let mut hash: [ u8 ; 32 ] = mem:: uninitialized ( ) ;
214
- ffi:: SHA256_Final ( hash. as_mut_ptr ( ) , & mut self . 0 ) ;
215
- hash
213
+ let mut hash: mem :: MaybeUninit < [ u8 ; 32 ] > = mem:: MaybeUninit :: uninit ( ) ;
214
+ ffi:: SHA256_Final ( hash. as_mut_ptr ( ) as * mut u8 , & mut self . 0 ) ;
215
+ hash. assume_init ( )
216
216
}
217
217
}
218
218
}
@@ -226,9 +226,9 @@ impl Sha384 {
226
226
#[ inline]
227
227
pub fn new ( ) -> Sha384 {
228
228
unsafe {
229
- let mut ctx = mem:: uninitialized ( ) ;
230
- ffi:: SHA384_Init ( & mut ctx) ;
231
- Sha384 ( ctx)
229
+ let mut ctx: mem :: MaybeUninit < ffi :: SHA512_CTX > = mem:: MaybeUninit :: uninit ( ) ;
230
+ ffi:: SHA384_Init ( ctx. as_mut_ptr ( ) ) ;
231
+ Sha384 ( ctx. assume_init ( ) )
232
232
}
233
233
}
234
234
@@ -246,9 +246,9 @@ impl Sha384 {
246
246
#[ inline]
247
247
pub fn finish ( mut self ) -> [ u8 ; 48 ] {
248
248
unsafe {
249
- let mut hash: [ u8 ; 48 ] = mem:: uninitialized ( ) ;
250
- ffi:: SHA384_Final ( hash. as_mut_ptr ( ) , & mut self . 0 ) ;
251
- hash
249
+ let mut hash: mem :: MaybeUninit < [ u8 ; 48 ] > = mem:: MaybeUninit :: uninit ( ) ;
250
+ ffi:: SHA384_Final ( hash. as_mut_ptr ( ) as * mut u8 , & mut self . 0 ) ;
251
+ hash. assume_init ( )
252
252
}
253
253
}
254
254
}
@@ -262,9 +262,9 @@ impl Sha512 {
262
262
#[ inline]
263
263
pub fn new ( ) -> Sha512 {
264
264
unsafe {
265
- let mut ctx = mem:: uninitialized ( ) ;
266
- ffi:: SHA512_Init ( & mut ctx) ;
267
- Sha512 ( ctx)
265
+ let mut ctx: mem :: MaybeUninit < ffi :: SHA512_CTX > = mem:: MaybeUninit :: uninit ( ) ;
266
+ ffi:: SHA512_Init ( ctx. as_mut_ptr ( ) ) ;
267
+ Sha512 ( ctx. assume_init ( ) )
268
268
}
269
269
}
270
270
@@ -282,9 +282,9 @@ impl Sha512 {
282
282
#[ inline]
283
283
pub fn finish ( mut self ) -> [ u8 ; 64 ] {
284
284
unsafe {
285
- let mut hash: [ u8 ; 64 ] = mem:: uninitialized ( ) ;
286
- ffi:: SHA512_Final ( hash. as_mut_ptr ( ) , & mut self . 0 ) ;
287
- hash
285
+ let mut hash: mem :: MaybeUninit < [ u8 ; 64 ] > = mem:: MaybeUninit :: uninit ( ) ;
286
+ ffi:: SHA512_Final ( hash. as_mut_ptr ( ) as * mut u8 , & mut self . 0 ) ;
287
+ hash. assume_init ( )
288
288
}
289
289
}
290
290
}
0 commit comments