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
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
use std::fmt::{self, Debug, Display};
use std::str::FromStr;
use digest::Digest;
use itertools::{chain, Itertools};
use signature::Signer;
use thiserror::Error;
use tor_basic_utils::StrExt as _;
use tor_llcrypto::d::Sha3_256;
use tor_llcrypto::pk::ed25519::Ed25519PublicKey;
use tor_llcrypto::pk::{curve25519, ed25519, keymanip};
use tor_llcrypto::util::ct::CtByteArray;
use crate::macros::{define_bytes, define_pk_keypair};
use crate::time::TimePeriod;
define_bytes! {
#[derive(Copy, Clone, Eq, PartialEq, Hash)]
pub struct HsId([u8; 32]);
}
impl fmt::LowerHex for HsId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "HsId(0x")?;
for v in self.0.as_ref() {
write!(f, "{:02x}", v)?;
}
write!(f, ")")?;
Ok(())
}
}
impl Debug for HsId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "HsId({})", self)
}
}
define_pk_keypair! {
pub struct HsIdKey(ed25519::PublicKey) /
HsIdSecretKey(ed25519::ExpandedSecretKey);
}
impl HsIdKey {
pub fn id(&self) -> HsId {
HsId(self.0.to_bytes().into())
}
}
impl TryFrom<HsId> for HsIdKey {
type Error = signature::Error;
fn try_from(value: HsId) -> Result<Self, Self::Error> {
ed25519::PublicKey::from_bytes(value.0.as_ref()).map(HsIdKey)
}
}
impl From<HsIdKey> for HsId {
fn from(value: HsIdKey) -> Self {
value.id()
}
}
const HSID_ONION_VERSION: u8 = 0x03;
pub const HSID_ONION_SUFFIX: &str = ".onion";
impl Display for HsId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let checksum = self.onion_checksum();
let binary = chain!(self.0.as_ref(), &checksum, &[HSID_ONION_VERSION],)
.cloned()
.collect_vec();
let mut b32 = data_encoding::BASE32_NOPAD.encode(&binary);
b32.make_ascii_lowercase();
write!(f, "{}{}", b32, HSID_ONION_SUFFIX)
}
}
impl safelog::Redactable for HsId {
fn display_redacted(&self, f: &mut fmt::Formatter) -> fmt::Result {
let unredacted = self.to_string();
const DATA: usize = 56;
assert_eq!(unredacted.len(), DATA + HSID_ONION_SUFFIX.len());
write!(f, "???{}", &unredacted[DATA - 3..])
}
}
impl FromStr for HsId {
type Err = HsIdParseError;
fn from_str(s: &str) -> Result<Self, HsIdParseError> {
use HsIdParseError as PE;
let s = s
.strip_suffix_ignore_ascii_case(HSID_ONION_SUFFIX)
.ok_or(PE::NotOnionDomain)?;
if s.contains('.') {
return Err(PE::HsIdContainsSubdomain);
}
let mut s = s.to_owned();
s.make_ascii_uppercase();
let binary = data_encoding::BASE32_NOPAD.decode(s.as_bytes())?;
let mut binary = tor_bytes::Reader::from_slice(&binary);
let pubkey: [u8; 32] = binary.extract()?;
let checksum: [u8; 2] = binary.extract()?;
let version: u8 = binary.extract()?;
let tentative = HsId(pubkey.into());
if version != HSID_ONION_VERSION {
return Err(PE::UnsupportedVersion(version));
}
if checksum != tentative.onion_checksum() {
return Err(PE::WrongChecksum);
}
Ok(tentative)
}
}
#[derive(Error, Clone, Debug)]
#[non_exhaustive]
pub enum HsIdParseError {
#[error("Domain name does not end in .onion")]
NotOnionDomain,
#[error("Invalid base32 in .onion address")]
InvalidBase32(#[from] data_encoding::DecodeError),
#[error("Invalid encoded binary data in .onion address")]
InvalidData(#[from] tor_bytes::Error),
#[error("Unsupported .onion address version, v{0}")]
UnsupportedVersion(u8),
#[error("Checksum failed, .onion address corrupted")]
WrongChecksum,
#[error("`.onion` address with subdomain passed where not expected")]
HsIdContainsSubdomain,
}
impl HsId {
fn onion_checksum(&self) -> [u8; 2] {
let mut h = Sha3_256::new();
h.update(b".onion checksum");
h.update(self.0.as_ref());
h.update([HSID_ONION_VERSION]);
h.finalize()[..2]
.try_into()
.expect("slice of fixed size wasn't that size")
}
}
impl HsIdKey {
pub fn compute_blinded_key(
&self,
cur_period: TimePeriod,
) -> Result<(HsBlindIdKey, crate::Subcredential), keymanip::BlindingError> {
let secret = b"";
let h = self.blinding_factor(secret, cur_period);
let blinded_key = keymanip::blind_pubkey(&self.0, h)?;
let subcredential_bytes: [u8; 32] = {
let n_hs_cred: [u8; 32] = {
let mut h = Sha3_256::new();
h.update(b"credential");
h.update(self.0.as_bytes());
h.finalize().into()
};
let mut h = Sha3_256::new();
h.update(b"subcredential");
h.update(n_hs_cred);
h.update(blinded_key.as_bytes());
h.finalize().into()
};
Ok((blinded_key.into(), subcredential_bytes.into()))
}
fn blinding_factor(&self, secret: &[u8], cur_period: TimePeriod) -> [u8; 32] {
const BLIND_STRING: &[u8] = b"Derive temporary signing key\0";
const ED25519_BASEPOINT: &[u8] =
b"(15112221349535400772501151409588531511454012693041857206046113283949847762202, \
46316835694926478169428394003475163141307993866256225615783033603165251855960)";
let mut h = Sha3_256::new();
h.update(BLIND_STRING);
h.update(self.0.as_bytes());
h.update(secret);
h.update(ED25519_BASEPOINT);
h.update(b"key-blind");
h.update(cur_period.interval_num.to_be_bytes());
h.update((u64::from(cur_period.length.as_minutes())).to_be_bytes());
h.finalize().into()
}
}
impl HsIdSecretKey {
pub fn compute_blinded_key(
&self,
cur_period: TimePeriod,
) -> Result<(HsBlindIdKey, HsBlindIdSecretKey, crate::Subcredential), keymanip::BlindingError>
{
let secret = b"";
let public_key: HsIdKey = ed25519::PublicKey::from(&self.0).into();
let (blinded_public_key, subcredential) = public_key.compute_blinded_key(cur_period)?;
let h = public_key.blinding_factor(secret, cur_period);
let blinded_secret_key = keymanip::blind_seckey(&self.0, h)?;
Ok((blinded_public_key, blinded_secret_key.into(), subcredential))
}
}
define_pk_keypair! {
pub struct HsBlindIdKey(ed25519::PublicKey) / HsBlindIdSecretKey(ed25519::ExpandedSecretKey);
}
define_bytes! {
#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
pub struct HsBlindId([u8; 32]);
}
impl HsBlindIdKey {
pub fn id(&self) -> HsBlindId {
HsBlindId(self.0.to_bytes().into())
}
}
impl TryFrom<HsBlindId> for HsBlindIdKey {
type Error = signature::Error;
fn try_from(value: HsBlindId) -> Result<Self, Self::Error> {
ed25519::PublicKey::from_bytes(value.0.as_ref()).map(HsBlindIdKey)
}
}
impl From<HsBlindIdKey> for HsBlindId {
fn from(value: HsBlindIdKey) -> Self {
value.id()
}
}
impl From<ed25519::Ed25519Identity> for HsBlindId {
fn from(value: ed25519::Ed25519Identity) -> Self {
Self(CtByteArray::from(<[u8; 32]>::from(value)))
}
}
impl HsBlindIdSecretKey {
pub fn sign(&self, message: &[u8], public_key: &HsBlindIdKey) -> ed25519::Signature {
self.0.sign(message, &public_key.0)
}
}
#[allow(clippy::exhaustive_structs)]
#[derive(Debug)]
pub struct HsBlindKeypair {
pub public: HsBlindIdKey,
pub secret: HsBlindIdSecretKey,
}
impl Signer<ed25519::Signature> for HsBlindKeypair {
fn try_sign(&self, msg: &[u8]) -> Result<ed25519::Signature, signature::Error> {
Ok(self.secret.sign(msg, &self.public))
}
}
impl Ed25519PublicKey for HsBlindKeypair {
fn public_key(&self) -> &ed25519::PublicKey {
&self.public
}
}
define_pk_keypair! {
pub struct HsDescSigningKey(ed25519::PublicKey) / HsDescSigningSecretKey(ed25519::SecretKey);
}
define_pk_keypair! {
pub struct HsIntroPtSessionIdKey(ed25519::PublicKey) / HsIntroPtSessionIdSecretKey(ed25519::SecretKey);
}
define_pk_keypair! {
pub struct HsSvcNtorKey(curve25519::PublicKey) / HsSvcNtorSecretKey(curve25519::StaticSecret);
}
define_pk_keypair! {
pub struct HsClientIntroAuthKey(ed25519::PublicKey) / HsClientIntroAuthSecretKey(ed25519::SecretKey);
}
define_pk_keypair! {
pub struct HsClientDescEncKey(curve25519::PublicKey) / HsClientDescEncSecretKey(curve25519::StaticSecret);
}
define_pk_keypair! {
pub struct HsSvcDescEncKey(curve25519::PublicKey) / HsSvcDescEncSecretKey(curve25519::StaticSecret);
}
#[cfg(test)]
mod test {
#![allow(clippy::bool_assert_comparison)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::dbg_macro)]
#![allow(clippy::print_stderr)]
#![allow(clippy::print_stdout)]
#![allow(clippy::single_char_pattern)]
#![allow(clippy::unwrap_used)]
#![allow(clippy::unchecked_duration_subtraction)]
use hex_literal::hex;
use itertools::izip;
use safelog::Redactable;
use signature::Verifier;
use std::time::{Duration, SystemTime};
use tor_basic_utils::test_rng::testing_rng;
use tor_llcrypto::util::rand_compat::RngCompatExt as _;
use super::*;
#[test]
fn hsid_strings() {
use HsIdParseError as PE;
let hex = "d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a";
let b32 = "25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid";
let hsid: [u8; 32] = hex::decode(hex).unwrap().try_into().unwrap();
let hsid = HsId::from(hsid);
let onion = format!("{}.onion", b32);
assert_eq!(onion.parse::<HsId>().unwrap(), hsid);
assert_eq!(hsid.to_string(), onion);
let weird_case: String = izip!(onion.chars(), [false, true].iter().cloned().cycle(),)
.map(|(c, swap)| if swap { c.to_ascii_uppercase() } else { c })
.collect();
dbg!(&weird_case);
assert_eq!(weird_case.parse::<HsId>().unwrap(), hsid);
macro_rules! chk_err { { $s:expr, $($pat:tt)* } => {
let e = $s.parse::<HsId>();
assert!(matches!(e, Err($($pat)*)), "{:?}", &e);
} }
let edited = |i, c| {
let mut s = b32.to_owned().into_bytes();
s[i] = c;
format!("{}.onion", String::from_utf8(s).unwrap())
};
chk_err!("wrong", PE::NotOnionDomain);
chk_err!("@.onion", PE::InvalidBase32(..));
chk_err!("aaaaaaaa.onion", PE::InvalidData(..));
chk_err!(edited(55, b'E'), PE::UnsupportedVersion(4));
chk_err!(edited(53, b'X'), PE::WrongChecksum);
chk_err!(&format!("www.{}", &onion), PE::HsIdContainsSubdomain);
assert_eq!(format!("{:x}", &hsid), format!("HsId(0x{})", hex));
assert_eq!(format!("{:?}", &hsid), format!("HsId({})", onion));
assert_eq!(format!("{}", hsid.redacted()), "???sid.onion");
}
#[test]
fn key_blinding_blackbox() {
let mut rng = testing_rng().rng_compat();
let offset = Duration::new(12 * 60 * 60, 0);
let when = TimePeriod::new(Duration::from_secs(3600), SystemTime::now(), offset).unwrap();
let keypair = ed25519::Keypair::generate(&mut rng);
let id_pub = HsIdKey::from(keypair.public);
let id_sec = HsIdSecretKey::from(ed25519::ExpandedSecretKey::from(&keypair.secret));
let (blinded_pub, subcred1) = id_pub.compute_blinded_key(when).unwrap();
let (blinded_pub2, blinded_sec, subcred2) = id_sec.compute_blinded_key(when).unwrap();
assert_eq!(subcred1.as_ref(), subcred2.as_ref());
assert_eq!(blinded_pub.0.to_bytes(), blinded_pub2.0.to_bytes());
assert_eq!(blinded_pub.id(), blinded_pub2.id());
let message = b"Here is a terribly important string to authenticate.";
let other_message = b"Hey, that is not what I signed!";
let sign = blinded_sec.sign(message, &blinded_pub2);
assert!(blinded_pub.as_ref().verify(message, &sign).is_ok());
assert!(blinded_pub.as_ref().verify(other_message, &sign).is_err());
}
#[test]
fn key_blinding_testvec() {
let id = HsId::from(hex!(
"833990B085C1A688C1D4C8B1F6B56AFAF5A2ECA674449E1D704F83765CCB7BC6"
));
let id_pubkey = HsIdKey::try_from(id).unwrap();
let id_seckey = HsIdSecretKey::from(
ed25519::ExpandedSecretKey::from_bytes(&hex!(
"D8C7FF0E31295B66540D789AF3E3DF992038A9592EEA01D8B7CBA06D6E66D159
4D6167696320576F7264733A20737065697373636F62616C742062697669756D"
))
.unwrap(),
);
let time_period = TimePeriod::new(
humantime::parse_duration("1 day").unwrap(),
humantime::parse_rfc3339("1973-05-20T01:50:33Z").unwrap(),
humantime::parse_duration("12 hours").unwrap(),
)
.unwrap();
assert_eq!(time_period.interval_num, 1234);
let h = id_pubkey.blinding_factor(b"", time_period);
assert_eq!(
h,
hex!("379E50DB31FEE6775ABD0AF6FB7C371E060308F4F847DB09FE4CFE13AF602287")
);
let (blinded_pub1, subcred1) = id_pubkey.compute_blinded_key(time_period).unwrap();
assert_eq!(
blinded_pub1.0.to_bytes(),
hex!("3A50BF210E8F9EE955AE0014F7A6917FB65EBF098A86305ABB508D1A7291B6D5")
);
assert_eq!(
subcred1.as_ref(),
&hex!("635D55907816E8D76398A675A50B1C2F3E36B42A5CA77BA3A0441285161AE07D")
);
let (blinded_pub2, blinded_sec, subcred2) =
id_seckey.compute_blinded_key(time_period).unwrap();
assert_eq!(blinded_pub1.0.to_bytes(), blinded_pub2.0.to_bytes());
assert_eq!(subcred1.as_ref(), subcred2.as_ref());
assert_eq!(
blinded_sec.0.to_bytes(),
hex!(
"A958DC83AC885F6814C67035DE817A2C604D5D2F715282079448F789B656350B
4540FE1F80AA3F7E91306B7BF7A8E367293352B14A29FDCC8C19F3558075524B"
)
);
}
}