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
use super::*;
use generic_array::GenericArray;
impl Writer for Vec<u8> {
fn write_all(&mut self, bytes: &[u8]) {
self.extend_from_slice(bytes);
}
fn write_u8(&mut self, byte: u8) {
self.push(byte);
}
fn write_zeros(&mut self, n: usize) {
let new_len = self.len() + n;
self.resize(new_len, 0);
}
}
impl Writer for bytes::BytesMut {
fn write_all(&mut self, bytes: &[u8]) {
self.extend_from_slice(bytes);
}
}
impl Writeable for [u8] {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self);
}
}
impl Writeable for Vec<u8> {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(&self[..]);
}
}
impl<N> Readable for GenericArray<u8, N>
where
N: generic_array::ArrayLength<u8>,
{
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
Ok(Self::clone_from_slice(b.take(N::to_usize())?))
}
}
impl<N> Writeable for GenericArray<u8, N>
where
N: generic_array::ArrayLength<u8>,
{
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_slice());
}
}
macro_rules! impl_u {
( $t:ty, $wrfn:ident, $rdfn:ident ) => {
impl Writeable for $t {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.$wrfn(*self)
}
}
impl Readable for $t {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
b.$rdfn()
}
}
};
}
impl_u!(u8, write_u8, take_u8);
impl_u!(u16, write_u16, take_u16);
impl_u!(u32, write_u32, take_u32);
impl_u!(u64, write_u64, take_u64);
impl_u!(u128, write_u128, take_u128);
mod net_impls {
use super::*;
use std::net::{Ipv4Addr, Ipv6Addr};
impl Writeable for Ipv4Addr {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(&self.octets()[..]);
}
}
impl Readable for Ipv4Addr {
fn take_from(r: &mut Reader<'_>) -> Result<Self> {
Ok(r.take_u32()?.into())
}
}
impl Writeable for Ipv6Addr {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(&self.octets()[..]);
}
}
impl Readable for Ipv6Addr {
fn take_from(r: &mut Reader<'_>) -> Result<Self> {
Ok(r.take_u128()?.into())
}
}
}
mod ed25519_impls {
use super::*;
#[allow(unused_imports)]
use signature::Signature;
use tor_llcrypto::pk::ed25519;
impl Writeable for ed25519::PublicKey {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_bytes());
}
}
impl Readable for ed25519::PublicKey {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let bytes = b.take(32)?;
Self::from_bytes(array_ref![bytes, 0, 32])
.map_err(|_| Error::BadMessage("Couldn't decode Ed25519 public key"))
}
}
impl Writeable for ed25519::Ed25519Identity {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_bytes());
}
}
impl Readable for ed25519::Ed25519Identity {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let bytes = b.take(32)?;
Ok(Self::new(*array_ref![bytes, 0, 32]))
}
}
impl Writeable for ed25519::Signature {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(&self.to_bytes()[..]);
}
}
impl Readable for ed25519::Signature {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let bytes = b.take(64)?;
Self::from_bytes(array_ref![bytes, 0, 64])
.map_err(|_| Error::BadMessage("Couldn't decode Ed25519 signature."))
}
}
}
mod curve25519_impls {
use super::*;
use tor_llcrypto::pk::curve25519::{PublicKey, SharedSecret};
impl Writeable for PublicKey {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_bytes());
}
}
impl Readable for PublicKey {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let bytes = b.take(32)?;
Ok((*array_ref![bytes, 0, 32]).into())
}
}
impl Writeable for SharedSecret {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_bytes());
}
}
}
mod rsa_impls {
use super::*;
use tor_llcrypto::pk::rsa::*;
impl Writeable for RsaIdentity {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(self.as_bytes());
}
}
impl Readable for RsaIdentity {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let m = b.take(RSA_ID_LEN)?;
RsaIdentity::from_bytes(m)
.ok_or_else(|| tor_error::internal!("wrong number of bytes from take").into())
}
}
}
mod digest_impls {
use super::*;
use digest::{CtOutput, OutputSizeUser};
impl<T: OutputSizeUser> WriteableOnce for CtOutput<T> {
fn write_into<B: Writer + ?Sized>(self, b: &mut B) {
let code = self.into_bytes();
b.write(&code[..]);
}
}
impl<T: OutputSizeUser> Readable for CtOutput<T> {
fn take_from(b: &mut Reader<'_>) -> Result<Self> {
let array = GenericArray::take_from(b)?;
Ok(CtOutput::new(array))
}
}
}
mod u8_array_impls {
use super::*;
impl<const N: usize> Writeable for [u8; N] {
fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) {
b.write_all(&self[..]);
}
}
impl<const N: usize> Readable for [u8; N] {
fn take_from(r: &mut Reader<'_>) -> Result<Self> {
let mut array = [0_u8; N];
r.take_into(&mut array[..])?;
Ok(array)
}
}
}
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use crate::{Reader, Writer};
use hex_literal::hex;
macro_rules! check_encode {
($e:expr, $e2:expr) => {
let mut w = Vec::new();
w.write(&$e);
assert_eq!(&w[..], &$e2[..]);
};
}
macro_rules! check_decode {
($t:ty, $e:expr, $e2:expr) => {
let mut r = Reader::from_slice(&$e[..]);
let obj: $t = r.extract().unwrap();
assert_eq!(obj, $e2);
assert!(r.should_be_exhausted().is_ok());
};
}
macro_rules! check_roundtrip {
($t:ty, $e:expr, $e2:expr) => {
check_encode!($e, $e2);
check_decode!($t, $e2, $e);
};
}
macro_rules! check_bad {
($t:ty, $e:expr) => {
let mut r = Reader::from_slice(&$e[..]);
let len_orig = r.remaining();
let res: Result<$t, _> = r.extract();
assert!(res.is_err());
assert_eq!(r.remaining(), len_orig);
};
}
#[test]
fn vec_u8() {
let v: Vec<u8> = vec![1, 2, 3, 4];
check_encode!(v, b"\x01\x02\x03\x04");
}
#[test]
fn genarray() {
use generic_array as ga;
let a: ga::GenericArray<u8, ga::typenum::U7> = [4, 5, 6, 7, 8, 9, 10].into();
check_roundtrip!(ga::GenericArray<u8, ga::typenum::U7>,
a,
[4, 5, 6, 7, 8, 9, 10]);
}
#[test]
fn roundtrip_u64() {
check_roundtrip!(u64, 0x4040111_u64, [0, 0, 0, 0, 4, 4, 1, 17]);
}
#[test]
fn u8_array() {
check_roundtrip!(
[u8; 16],
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
);
}
#[test]
fn ipv4addr() {
use std::net::Ipv4Addr;
check_roundtrip!(Ipv4Addr, Ipv4Addr::new(192, 168, 0, 1), [192, 168, 0, 1]);
}
#[test]
fn ipv6addr() {
use std::net::Ipv6Addr;
check_roundtrip!(
Ipv6Addr,
Ipv6Addr::new(65535, 77, 1, 1, 1, 0, 0, 0),
[255, 255, 0, 77, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0]
);
}
#[test]
fn ed25519() {
#[allow(unused_imports)]
use signature::Signature;
use tor_llcrypto::pk::ed25519;
let b = &hex!(
"68a6cee11d2883661f5876f7aac748992cd140f
cfc36923aa957d04b5f8967ff"
);
check_roundtrip!(
ed25519::PublicKey,
ed25519::PublicKey::from_bytes(b).unwrap(),
b
);
let b = &hex!(
"68a6cee11d2883661f5876f7aac748992cd140f
cfc36923aa957d04b5f8967"
);
check_bad!(ed25519::PublicKey, b);
let b = &hex!(
"68a6cee11d2883661f5876f7aac748992cd140f
cfc36923aa957d04b5f896700"
);
check_bad!(ed25519::PublicKey, b);
let sig = &hex!(
"b8842c083a56076fc27c8af21211f9fe57d1c32d9d
c804f76a8fa858b9ab43622b9e8335993c422eab15
6ebb5a047033f35256333a47a508b02699314d22550e"
);
check_roundtrip!(
ed25519::Signature,
ed25519::Signature::from_bytes(sig).unwrap(),
sig
);
let sig = &hex!(
"b8842c083a56076fc27c8af21211f9fe57d1c32d9d
c804f76a8fa858b9ab43622b9e8335993c422eab15
6ebb5a047033f35256333a47a508b02699314d2255ff"
);
check_bad!(ed25519::Signature, sig);
}
#[test]
fn curve25519() {
use tor_llcrypto::pk::curve25519;
let b = &hex!("5f6df7a2fe3bcf1c9323e9755250efd79b9db4ed8f3fd21c7515398b6662a365");
let pk: curve25519::PublicKey = (*b).into();
check_roundtrip!(curve25519::PublicKey, pk, b);
}
#[test]
fn rsa_id() {
use tor_llcrypto::pk::rsa::RsaIdentity;
let b = &hex!("9432D4CEA2621ED09F5A8088BE0E31E0D271435C");
check_roundtrip!(RsaIdentity, RsaIdentity::from_bytes(b).unwrap(), b);
}
}