1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
#[cfg(feature = "serde")] extern crate serde;
use std::fmt;
use std::borrow::{Borrow, BorrowMut};
#[cfg(feature = "serde")] use serde::ser::{Serialize, Serializer};
#[cfg(feature = "serde")] use serde::de::{self, Deserialize, Deserializer, Visitor};
#[cfg(all(test, feature = "serde"))] extern crate serde_cbor;
fn size_of<T: Sized>(slice: &[T]) -> usize {
slice.len() * std::mem::size_of::<T>()
}
fn box_as_slice<T: Sized>(reference: &Box<T>) -> &[T] {
unsafe { std::slice::from_raw_parts(reference as &T, 1) }
}
fn box_as_slice_mut<T: Sized + Copy>(reference: &mut Box<T>) -> &mut [T] {
unsafe { std::slice::from_raw_parts_mut(reference as &mut T, 1) }
}
#[cfg(feature = "libsodium-sys")]
mod mem {
extern crate libsodium_sys as sodium;
use std;
use ::size_of;
pub fn zero<T: Sized + Copy>(slice: &mut [T]) {
unsafe {
sodium::sodium_memzero(slice.as_ptr() as *mut _, size_of(slice));
}
}
pub fn cmp<T: Sized + Copy>(us: &[T], them: &[T]) -> bool {
if us.len() != them.len() {
return false;
}
unsafe {
sodium::sodium_memcmp(us.as_ptr() as *const _, them.as_ptr() as *const _, size_of(them)) == 0
}
}
pub fn hash<T: Sized + Copy, H>(slice: &[T], state: &mut H) where H: std::hash::Hasher {
let mut hash = [0u8; sodium::crypto_hash_BYTES as _];
unsafe {
assert_eq!(sodium::crypto_hash(&mut hash[0] as *mut _, slice.as_ptr() as *const _, size_of(slice) as u64), 0);
};
let mut round2 = Vec::new();
unsafe {
let salt = std::slice::from_raw_parts(state as *const H as *const u8, std::mem::size_of::<H>());
round2.reserve_exact(hash.len() + salt.len());
round2.extend_from_slice(&hash);
round2.extend_from_slice(salt);
};
let mut hash2 = [0u8; sodium::crypto_hash_BYTES as _];
unsafe {
assert_eq!(sodium::crypto_hash(&mut hash2[0] as *mut _, round2.as_ptr(), round2.len() as u64), 0);
};
state.write(&hash2 as &[u8]);
}
}
#[cfg(not(feature = "libsodium-sys"))]
mod mem {
use std;
use ::size_of;
#[inline(never)]
pub fn zero<T: Sized + Copy>(slice: &mut [T]) {
let ptr = slice.as_mut_ptr() as *mut u8;
for i in 0 .. size_of(slice) {
unsafe {
std::ptr::write_volatile(ptr.offset(i as isize), 0);
}
}
}
#[inline(never)]
pub fn cmp<T: Sized + Copy>(us: &[T], them: &[T]) -> bool {
if us.len() != them.len() {
return false;
}
let mut result: u8 = 0;
let ptr_us = us.as_ptr() as *mut u8;
let ptr_them = them.as_ptr() as *mut u8;
for i in 0 .. size_of(us) {
unsafe {
result |= *(ptr_us.offset(i as isize)) ^ *(ptr_them.offset(i as isize));
}
}
result == 0
}
}
#[cfg(unix)]
mod memlock {
extern crate libc;
use ::size_of;
pub fn mlock<T: Sized>(cont: &[T]) {
unsafe {
libc::mlock(cont.as_ptr() as *const libc::c_void, size_of(cont));
}
}
pub fn munlock<T: Sized>(cont: &[T]) {
unsafe {
libc::munlock(cont.as_ptr() as *const libc::c_void, size_of(cont));
}
}
}
#[cfg(not(unix))]
mod memlock {
pub fn mlock<T: Sized>(cont: &[T]) {
}
pub fn munlock<T: Sized>(cont: &[T]) {
}
}
pub type SecStr = SecVec<u8>;
#[derive(Clone, Eq)]
pub struct SecVec<T> where T: Sized + Copy {
content: Vec<T>
}
impl<T> SecVec<T> where T: Sized + Copy {
pub fn new(cont: Vec<T>) -> Self {
memlock::mlock(&cont);
SecVec { content: cont }
}
pub fn unsecure(&self) -> &[T] {
self.borrow()
}
pub fn unsecure_mut(&mut self) -> &mut [T] {
self.borrow_mut()
}
pub fn zero_out(&mut self) {
mem::zero(&mut self.content);
}
}
impl<T, U> From<U> for SecVec<T> where U: Into<Vec<T>>, T: Sized + Copy {
fn from(s: U) -> SecVec<T> {
SecVec::new(s.into())
}
}
impl<T, U> std::ops::Index<U> for SecVec<T> where T: Sized + Copy, Vec<T>: std::ops::Index<U> {
type Output = <Vec<T> as std::ops::Index<U>>::Output;
fn index(&self, index: U) -> &Self::Output {
std::ops::Index::index(&self.content, index)
}
}
impl<T> Borrow<[T]> for SecVec<T> where T: Sized + Copy {
fn borrow(&self) -> &[T] {
self.content.borrow()
}
}
impl<T> BorrowMut<[T]> for SecVec<T> where T: Sized + Copy {
fn borrow_mut(&mut self) -> &mut [T] {
self.content.borrow_mut()
}
}
impl<T> Drop for SecVec<T> where T: Sized + Copy {
fn drop(&mut self) {
self.zero_out();
memlock::munlock(&self.content);
}
}
impl<T> PartialEq for SecVec<T> where T: Sized + Copy {
fn eq(&self, other: &SecVec<T>) -> bool {
mem::cmp(&self.content, &other.content)
}
}
impl<T> fmt::Debug for SecVec<T> where T: Sized + Copy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("***SECRET***").map_err(|_| { fmt::Error })
}
}
impl<T> fmt::Display for SecVec<T> where T: Sized + Copy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("***SECRET***").map_err(|_| { fmt::Error })
}
}
#[cfg(feature = "serde")]
struct BytesVisitor;
#[cfg(feature = "serde")]
impl<'de> Visitor<'de> for BytesVisitor {
type Value = SecVec<u8>;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("a byte array")
}
fn visit_bytes<E>(self, value: &[u8]) -> Result<SecVec<u8>, E> where E: de::Error {
Ok(SecStr::from(value))
}
}
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for SecVec<u8> {
fn deserialize<D>(deserializer: D) -> Result<SecVec<u8>, D::Error> where D: Deserializer<'de> {
deserializer.deserialize_bytes(BytesVisitor)
}
}
#[cfg(feature = "libsodium-sys")]
impl<T> std::hash::Hash for SecVec<T> where T: Sized + Copy {
fn hash<H>(&self, state: &mut H) where H: std::hash::Hasher {
mem::hash(&self.content, state);
}
}
#[cfg(feature = "serde")]
impl Serialize for SecVec<u8> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
serializer.serialize_bytes(self.content.borrow())
}
}
#[derive(Clone, Eq)]
pub struct SecBox<T> where T: Sized + Copy {
content: Box<T>
}
impl<T> SecBox<T> where T: Sized + Copy {
pub fn new(cont: Box<T>) -> Self {
memlock::mlock(box_as_slice(&cont));
SecBox { content: cont }
}
pub fn unsecure(&self) -> &T {
&self.content
}
pub fn unsecure_mut(&mut self) -> &mut T {
&mut self.content
}
pub fn zero_out(&mut self) {
mem::zero(box_as_slice_mut(&mut self.content));
}
}
impl<T, U> std::ops::Index<U> for SecBox<T> where T: std::ops::Index<U> + Sized + Copy {
type Output = <T as std::ops::Index<U>>::Output;
fn index(&self, index: U) -> &Self::Output {
std::ops::Index::index(self.content.as_ref(), index)
}
}
impl<T> Borrow<T> for SecBox<T> where T: Sized + Copy {
fn borrow(&self) -> &T {
&self.content
}
}
impl<T> BorrowMut<T> for SecBox<T> where T: Sized + Copy {
fn borrow_mut(&mut self) -> &mut T {
&mut self.content
}
}
impl<T> Drop for SecBox<T> where T: Sized + Copy {
fn drop(&mut self) {
self.zero_out();
memlock::munlock(box_as_slice_mut(&mut self.content));
}
}
impl<T> PartialEq for SecBox<T> where T: Sized + Copy {
fn eq(&self, other: &SecBox<T>) -> bool {
mem::cmp(box_as_slice(&self.content), box_as_slice(&other.content))
}
}
impl<T> fmt::Debug for SecBox<T> where T: Sized + Copy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("***SECRET***").map_err(|_| { fmt::Error })
}
}
impl<T> fmt::Display for SecBox<T> where T: Sized + Copy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("***SECRET***").map_err(|_| { fmt::Error })
}
}
#[cfg(feature = "libsodium-sys")]
impl<T> std::hash::Hash for SecBox<T> where T: Sized + Copy {
fn hash<H>(&self, state: &mut H) where H: std::hash::Hasher {
mem::hash(box_as_slice(&self.content), state);
}
}
#[cfg(test)]
mod tests {
use super::{SecBox, SecStr, SecVec};
#[test]
fn test_basic() {
let my_sec = SecStr::from("hello");
assert_eq!(my_sec, SecStr::from("hello".to_string()));
assert_eq!(my_sec.unsecure(), b"hello");
}
#[test]
fn test_zero_out() {
let mut my_sec = SecStr::from("hello");
my_sec.zero_out();
assert_eq!(my_sec.unsecure(), b"\x00\x00\x00\x00\x00");
}
#[test]
fn test_comparison() {
assert_eq!(SecStr::from("hello"), SecStr::from("hello"));
assert!( SecStr::from("hello") != SecStr::from("yolo"));
assert!( SecStr::from("hello") != SecStr::from("olleh"));
assert!( SecStr::from("hello") != SecStr::from("helloworld"));
assert!( SecStr::from("hello") != SecStr::from(""));
}
#[test]
fn test_indexing() {
let string = SecStr::from("hello");
assert_eq!(string[0], 'h' as u8);
assert_eq!(&string[3 .. 5], "lo".as_bytes());
}
#[test]
fn test_show() {
assert_eq!(format!("{:?}", SecStr::from("hello")), "***SECRET***".to_string());
assert_eq!(format!("{}", SecStr::from("hello")), "***SECRET***".to_string());
}
#[cfg(feature = "libsodium-sys")]
#[test]
fn test_hashing() {
use std::hash::*;
let value = SecStr::from("hello");
let mut hasher = SipHasher::new();
value.hash(&mut hasher);
assert_eq!(hasher.finish(), 12960579610752219549);
}
#[test]
fn test_comparison_zero_out_mb() {
let mbstring1 = SecVec::from(vec!['H','a','l','l','o',' ','🦄','!']);
let mbstring2 = SecVec::from(vec!['H','a','l','l','o',' ','🦄','!']);
let mbstring3 = SecVec::from(vec!['!','🦄',' ','o','l','l','a','H']);
assert!(mbstring1 == mbstring2);
assert!(mbstring1 != mbstring3);
let mut mbstring = mbstring1.clone();
mbstring.zero_out();
assert_eq!(mbstring.unsecure(), &['\0','\0','\0','\0','\0','\0','\0','\0']);
}
const PRIVATE_KEY_1: [u8; 32] = [
0xb0, 0x3b, 0x34, 0xc3, 0x3a, 0x1c, 0x44, 0xf2,
0x25, 0xb6, 0x62, 0xd2, 0xbf, 0x48, 0x59, 0xb8,
0x13, 0x54, 0x11, 0xfa, 0x7b, 0x03, 0x86, 0xd4,
0x5f, 0xb7, 0x5d, 0xc5, 0xb9, 0x1b, 0x44, 0x66];
const PRIVATE_KEY_2: [u8; 32] = [
0xc8, 0x06, 0x43, 0x9d, 0xc9, 0xd2, 0xc4, 0x76,
0xff, 0xed, 0x8f, 0x25, 0x80, 0xc0, 0x88, 0x8d,
0x58, 0xab, 0x40, 0x6b, 0xf7, 0xae, 0x36, 0x98,
0x87, 0x90, 0x21, 0xb9, 0x6b, 0xb4, 0xbf, 0x59];
#[test]
fn test_secbox() {
let key_1 = SecBox::new(Box::new(PRIVATE_KEY_1));
let key_2 = SecBox::new(Box::new(PRIVATE_KEY_2));
let key_3 = SecBox::new(Box::new(PRIVATE_KEY_1));
assert!(key_1 == key_1);
assert!(key_1 != key_2);
assert!(key_2 != key_3);
assert!(key_1 == key_3);
let mut final_key = key_1.clone();
final_key.zero_out();
assert_eq!(final_key.unsecure(), &[0; 32]);
}
#[cfg(feature = "serde")]
#[test]
fn test_serialization() {
use serde_cbor::{to_vec, from_slice};
let my_sec = SecStr::from("hello");
let my_cbor = to_vec(&my_sec).unwrap();
assert_eq!(my_cbor, b"\x45hello");
let my_sec2 = from_slice(&my_cbor).unwrap();
assert_eq!(my_sec, my_sec2);
}
}