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
use old_rand_core::{CryptoRng as OldCryptoRng, Error as OldError, RngCore as OldRngCore};
use rand_core::{CryptoRng, Error, RngCore};
pub trait RngCompatExt: RngCore {
type Wrapper: RngCore + OldRngCore;
fn rng_compat(self) -> Self::Wrapper;
}
impl<T: RngCore + Sized> RngCompatExt for T {
type Wrapper = RngWrapper<T>;
fn rng_compat(self) -> RngWrapper<Self> {
self.into()
}
}
pub struct RngWrapper<T>(T);
impl<T: RngCore> From<T> for RngWrapper<T> {
fn from(rng: T) -> RngWrapper<T> {
RngWrapper(rng)
}
}
impl<T: RngCore> OldRngCore for RngWrapper<T> {
fn next_u32(&mut self) -> u32 {
self.0.next_u32()
}
fn next_u64(&mut self) -> u64 {
self.0.next_u64()
}
fn fill_bytes(&mut self, dest: &mut [u8]) {
self.0.fill_bytes(dest);
}
fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), OldError> {
self.0.try_fill_bytes(dest).map_err(|e| err_to_old(&e))
}
}
impl<T: RngCore> RngCore for RngWrapper<T> {
fn next_u32(&mut self) -> u32 {
self.0.next_u32()
}
fn next_u64(&mut self) -> u64 {
self.0.next_u64()
}
fn fill_bytes(&mut self, dest: &mut [u8]) {
self.0.fill_bytes(dest);
}
fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
self.0.try_fill_bytes(dest)
}
}
impl<T: CryptoRng> OldCryptoRng for RngWrapper<T> {}
impl<T: CryptoRng> CryptoRng for RngWrapper<T> {}
fn err_to_old(e: &Error) -> OldError {
use std::num::NonZeroU32;
if let Some(code) = e.code() {
code.into()
} else {
#[allow(clippy::unwrap_used)]
let nz: NonZeroU32 = OldError::CUSTOM_START.try_into().unwrap();
nz.into()
}
}
#[cfg(test)]
mod test {
#![allow(clippy::unwrap_used)]
use super::*;
use tor_basic_utils::test_rng::testing_rng;
fn or_into(dst: &mut [u8], src: &[u8]) {
assert_eq!(dst.len(), src.len());
for i in 0..dst.len() {
dst[i] |= src[i];
}
}
fn and_into(dst: &mut [u8], src: &[u8]) {
assert_eq!(dst.len(), src.len());
for i in 0..dst.len() {
dst[i] &= src[i];
}
}
#[test]
fn test_wrapper_as_old() {
let mut wrapped = testing_rng().rng_compat();
let mut z64 = 0xffffffffffffffff_u64;
let mut z32 = 0xffffffff_u32;
let mut z17 = [0xff_u8; 17];
let mut z17_try = [0xff_u8; 17];
let mut o64 = 0_u64;
let mut o32 = 0_u32;
let mut o17 = [0_u8; 17];
let mut o17_try = [0_u8; 17];
for _ in 0..1000 {
let u = OldRngCore::next_u64(&mut wrapped);
z64 &= u;
o64 |= u;
let u = OldRngCore::next_u32(&mut wrapped);
z32 &= u;
o32 |= u;
let mut bytes = [0; 17];
OldRngCore::fill_bytes(&mut wrapped, &mut bytes);
and_into(&mut z17, &bytes);
or_into(&mut o17, &bytes);
let mut bytes = [0; 17];
OldRngCore::try_fill_bytes(&mut wrapped, &mut bytes).unwrap();
and_into(&mut z17_try, &bytes);
or_into(&mut o17_try, &bytes);
}
assert_eq!(z64, 0);
assert_eq!(z32, 0);
assert_eq!(o64, 0xffffffffffffffff_u64);
assert_eq!(o32, 0xffffffff_u32);
assert_eq!(z17, [0; 17]);
assert_eq!(z17_try, [0; 17]);
assert_eq!(o17, [0xff; 17]);
assert_eq!(o17_try, [0xff; 17]);
}
#[test]
fn test_wrapper_as_new() {
let mut wrapped = testing_rng().rng_compat();
let mut z64 = 0xffffffffffffffff_u64;
let mut z32 = 0xffffffff_u32;
let mut z17 = [0xff_u8; 17];
let mut z17_try = [0xff_u8; 17];
let mut o64 = 0_u64;
let mut o32 = 0_u32;
let mut o17 = [0_u8; 17];
let mut o17_try = [0_u8; 17];
for _ in 0..1000 {
let u = RngCore::next_u64(&mut wrapped);
z64 &= u;
o64 |= u;
let u = RngCore::next_u32(&mut wrapped);
z32 &= u;
o32 |= u;
let mut bytes = [0; 17];
RngCore::fill_bytes(&mut wrapped, &mut bytes);
and_into(&mut z17, &bytes);
or_into(&mut o17, &bytes);
let mut bytes = [0; 17];
RngCore::try_fill_bytes(&mut wrapped, &mut bytes).unwrap();
and_into(&mut z17_try, &bytes);
or_into(&mut o17_try, &bytes);
}
assert_eq!(z64, 0);
assert_eq!(z32, 0);
assert_eq!(o64, 0xffffffffffffffff_u64);
assert_eq!(o32, 0xffffffff_u32);
assert_eq!(z17, [0; 17]);
assert_eq!(z17_try, [0; 17]);
assert_eq!(o17, [0xff; 17]);
assert_eq!(o17_try, [0xff; 17]);
}
}