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
use super::{KeyGenerator, RelayHandshakeError, RelayHandshakeResult};
use crate::util::ct;
use crate::{Error, Result, SecretBytes};
use tor_bytes::{Reader, Writer};
use tor_llcrypto::d;
use tor_llcrypto::pk::curve25519::*;
use tor_llcrypto::pk::rsa::RsaIdentity;
use tor_llcrypto::util::rand_compat::RngCompatExt;
use digest::Mac;
use rand_core::{CryptoRng, RngCore};
use zeroize::Zeroizing;
pub(crate) struct NtorClient;
impl super::ClientHandshake for NtorClient {
type KeyType = NtorPublicKey;
type StateType = NtorHandshakeState;
type KeyGen = NtorHkdfKeyGenerator;
fn client1<R: RngCore + CryptoRng>(
rng: &mut R,
key: &Self::KeyType,
) -> Result<(Self::StateType, Vec<u8>)> {
Ok(client_handshake_ntor_v1(rng, key))
}
fn client2<T: AsRef<[u8]>>(state: Self::StateType, msg: T) -> Result<Self::KeyGen> {
client_handshake2_ntor_v1(msg, &state)
}
}
pub(crate) struct NtorServer;
impl super::ServerHandshake for NtorServer {
type KeyType = NtorSecretKey;
type KeyGen = NtorHkdfKeyGenerator;
fn server<R: RngCore + CryptoRng, T: AsRef<[u8]>>(
rng: &mut R,
key: &[Self::KeyType],
msg: T,
) -> RelayHandshakeResult<(Self::KeyGen, Vec<u8>)> {
server_handshake_ntor_v1(rng, msg, key)
}
}
#[derive(Clone, Debug)]
pub(crate) struct NtorPublicKey {
pub(crate) id: RsaIdentity,
pub(crate) pk: PublicKey,
}
pub(crate) struct NtorSecretKey {
pk: NtorPublicKey,
sk: StaticSecret,
}
use subtle::{Choice, ConstantTimeEq};
impl NtorSecretKey {
#[allow(unused)]
pub(crate) fn new(sk: StaticSecret, pk: PublicKey, id: RsaIdentity) -> Self {
NtorSecretKey {
pk: NtorPublicKey { id, pk },
sk,
}
}
fn matches_pk(&self, pk: &PublicKey) -> Choice {
self.pk.pk.as_bytes().ct_eq(pk.as_bytes())
}
}
pub(crate) struct NtorHandshakeState {
relay_public: NtorPublicKey,
my_sk: StaticSecret,
my_public: PublicKey,
}
pub(crate) struct NtorHkdfKeyGenerator {
seed: SecretBytes,
}
impl NtorHkdfKeyGenerator {
pub(crate) fn new(seed: SecretBytes) -> Self {
NtorHkdfKeyGenerator { seed }
}
}
impl KeyGenerator for NtorHkdfKeyGenerator {
fn expand(self, keylen: usize) -> Result<SecretBytes> {
let ntor1_key = &b"ntor-curve25519-sha256-1:key_extract"[..];
let ntor1_expand = &b"ntor-curve25519-sha256-1:key_expand"[..];
use crate::crypto::ll::kdf::{Kdf, Ntor1Kdf};
Ntor1Kdf::new(ntor1_key, ntor1_expand).derive(&self.seed[..], keylen)
}
}
type Authcode = digest::CtOutput<hmac::Hmac<d::Sha256>>;
fn client_handshake_ntor_v1<R>(
rng: &mut R,
relay_public: &NtorPublicKey,
) -> (NtorHandshakeState, Vec<u8>)
where
R: RngCore + CryptoRng,
{
let my_sk = StaticSecret::new(rng.rng_compat());
let my_public = PublicKey::from(&my_sk);
client_handshake_ntor_v1_no_keygen(my_public, my_sk, relay_public)
}
fn client_handshake_ntor_v1_no_keygen(
my_public: PublicKey,
my_sk: StaticSecret,
relay_public: &NtorPublicKey,
) -> (NtorHandshakeState, Vec<u8>) {
let mut v: Vec<u8> = Vec::new();
v.write(&relay_public.id);
v.write(&relay_public.pk);
v.write(&my_public);
assert_eq!(v.len(), 20 + 32 + 32);
let state = NtorHandshakeState {
relay_public: relay_public.clone(),
my_public,
my_sk,
};
(state, v)
}
fn client_handshake2_ntor_v1<T>(msg: T, state: &NtorHandshakeState) -> Result<NtorHkdfKeyGenerator>
where
T: AsRef<[u8]>,
{
let mut cur = Reader::from_slice(msg.as_ref());
let their_pk: PublicKey = cur.extract()?;
let auth: Authcode = cur.extract()?;
let xy = state.my_sk.diffie_hellman(&their_pk);
let xb = state.my_sk.diffie_hellman(&state.relay_public.pk);
let (keygen, authcode) =
ntor_derive(&xy, &xb, &state.relay_public, &state.my_public, &their_pk);
let okay = authcode.ct_eq(&auth)
& ct::bool_to_choice(xy.was_contributory())
& ct::bool_to_choice(xb.was_contributory());
if okay.into() {
Ok(keygen)
} else {
Err(Error::BadCircHandshake)
}
}
fn ntor_derive(
xy: &SharedSecret,
xb: &SharedSecret,
server_pk: &NtorPublicKey,
x: &PublicKey,
y: &PublicKey,
) -> (NtorHkdfKeyGenerator, Authcode) {
let ntor1_protoid = &b"ntor-curve25519-sha256-1"[..];
let ntor1_mac = &b"ntor-curve25519-sha256-1:mac"[..];
let ntor1_verify = &b"ntor-curve25519-sha256-1:verify"[..];
let server_string = &b"Server"[..];
let mut secret_input = Zeroizing::new(Vec::new());
secret_input.write(xy);
secret_input.write(xb);
secret_input.write(&server_pk.id);
secret_input.write(&server_pk.pk);
secret_input.write(x);
secret_input.write(y);
secret_input.write(ntor1_protoid);
use hmac::Hmac;
use tor_llcrypto::d::Sha256;
let verify = {
let mut m =
Hmac::<Sha256>::new_from_slice(ntor1_verify).expect("Hmac allows keys of any size");
m.update(&secret_input[..]);
m.finalize()
};
let mut auth_input: SecretBytes = Zeroizing::new(Vec::new());
auth_input.write_and_consume(verify);
auth_input.write(&server_pk.id);
auth_input.write(&server_pk.pk);
auth_input.write(y);
auth_input.write(x);
auth_input.write(ntor1_protoid);
auth_input.write(server_string);
let auth_mac = {
let mut m =
Hmac::<Sha256>::new_from_slice(ntor1_mac).expect("Hmac allows keys of any size");
m.update(&auth_input[..]);
m.finalize()
};
let keygen = NtorHkdfKeyGenerator::new(secret_input);
(keygen, auth_mac)
}
fn server_handshake_ntor_v1<R, T>(
rng: &mut R,
msg: T,
keys: &[NtorSecretKey],
) -> RelayHandshakeResult<(NtorHkdfKeyGenerator, Vec<u8>)>
where
R: RngCore + CryptoRng,
T: AsRef<[u8]>,
{
let ephem = EphemeralSecret::new(rng.rng_compat());
let ephem_pub = PublicKey::from(&ephem);
server_handshake_ntor_v1_no_keygen(ephem_pub, ephem, msg, keys)
}
fn server_handshake_ntor_v1_no_keygen<T>(
ephem_pub: PublicKey,
ephem: EphemeralSecret,
msg: T,
keys: &[NtorSecretKey],
) -> RelayHandshakeResult<(NtorHkdfKeyGenerator, Vec<u8>)>
where
T: AsRef<[u8]>,
{
let mut cur = Reader::from_slice(msg.as_ref());
let my_id: RsaIdentity = cur.extract()?;
let my_key: PublicKey = cur.extract()?;
let their_pk: PublicKey = cur.extract()?;
let keypair = ct::lookup(keys, |key| key.matches_pk(&my_key));
let keypair = match keypair {
Some(k) => k,
None => return Err(RelayHandshakeError::MissingKey),
};
if my_id != keypair.pk.id {
return Err(RelayHandshakeError::MissingKey);
}
let xy = ephem.diffie_hellman(&their_pk);
let xb = keypair.sk.diffie_hellman(&their_pk);
let okay =
ct::bool_to_choice(xy.was_contributory()) & ct::bool_to_choice(xb.was_contributory());
let (keygen, authcode) = ntor_derive(&xy, &xb, &keypair.pk, &their_pk, &ephem_pub);
let mut reply: Vec<u8> = Vec::new();
reply.write(&ephem_pub);
reply.write_and_consume(authcode);
if okay.into() {
Ok((keygen, reply))
} else {
Err(RelayHandshakeError::BadHandshake)
}
}
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use super::*;
use crate::crypto::testing::FakePRNG;
use tor_basic_utils::test_rng::testing_rng;
#[test]
fn simple() -> Result<()> {
use crate::crypto::handshake::{ClientHandshake, ServerHandshake};
let mut rng = testing_rng().rng_compat();
let relay_secret = StaticSecret::new(&mut rng);
let relay_public = PublicKey::from(&relay_secret);
let relay_identity = RsaIdentity::from_bytes(&[12; 20]).unwrap();
let relay_ntpk = NtorPublicKey {
id: relay_identity,
pk: relay_public,
};
let (state, cmsg) = NtorClient::client1(&mut rng, &relay_ntpk)?;
let relay_ntsk = NtorSecretKey {
pk: relay_ntpk,
sk: relay_secret,
};
let relay_ntsks = [relay_ntsk];
let (skeygen, smsg) = NtorServer::server(&mut rng, &relay_ntsks, &cmsg).unwrap();
let ckeygen = NtorClient::client2(state, smsg)?;
let skeys = skeygen.expand(55)?;
let ckeys = ckeygen.expand(55)?;
assert_eq!(skeys, ckeys);
Ok(())
}
fn make_fake_ephem_key(bytes: &[u8]) -> EphemeralSecret {
assert_eq!(bytes.len(), 32);
let mut rng = FakePRNG::new(bytes).rng_compat();
EphemeralSecret::new(&mut rng)
}
#[test]
fn testvec() -> Result<()> {
use hex_literal::hex;
let b_sk = hex!("4820544f4c4420594f5520444f474954204b454550532048415050454e494e47");
let b_pk = hex!("ccbc8541904d18af08753eae967874749e6149f873de937f57f8fd903a21c471");
let x_sk = hex!("706f6461792069207075742e2e2e2e2e2e2e2e4a454c4c59206f6e2074686973");
let x_pk = hex!("e65dfdbef8b2635837fe2cebc086a8096eae3213e6830dc407516083d412b078");
let y_sk = hex!("70686520737175697272656c2e2e2e2e2e2e2e2e686173206869732067616d65");
let y_pk = hex!("390480a14362761d6aec1fea840f6e9e928fb2adb7b25c670be1045e35133a37");
let id = hex!("69546f6c64596f7541626f75745374616972732e");
let client_handshake = hex!("69546f6c64596f7541626f75745374616972732eccbc8541904d18af08753eae967874749e6149f873de937f57f8fd903a21c471e65dfdbef8b2635837fe2cebc086a8096eae3213e6830dc407516083d412b078");
let server_handshake = hex!("390480a14362761d6aec1fea840f6e9e928fb2adb7b25c670be1045e35133a371cbdf68b89923e1f85e8e18ee6e805ea333fe4849c790ffd2670bd80fec95cc8");
let keys = hex!("0c62dee7f48893370d0ef896758d35729867beef1a5121df80e00f79ed349af39b51cae125719182f19d932a667dae1afbf2e336e6910e7822223e763afad0a13342157969dc6b79");
let relay_pk = NtorPublicKey {
id: RsaIdentity::from_bytes(&id).unwrap(),
pk: b_pk.into(),
};
let relay_sk = NtorSecretKey {
pk: relay_pk.clone(),
sk: b_sk.into(),
};
let (state, create_msg) =
client_handshake_ntor_v1_no_keygen(x_pk.into(), x_sk.into(), &relay_pk);
assert_eq!(&create_msg[..], &client_handshake[..]);
let ephem = make_fake_ephem_key(&y_sk[..]);
let ephem_pub = y_pk.into();
let (s_keygen, created_msg) =
server_handshake_ntor_v1_no_keygen(ephem_pub, ephem, &create_msg[..], &[relay_sk])
.unwrap();
assert_eq!(&created_msg[..], &server_handshake[..]);
let c_keygen = client_handshake2_ntor_v1(created_msg, &state)?;
let c_keys = c_keygen.expand(keys.len())?;
let s_keys = s_keygen.expand(keys.len())?;
assert_eq!(&c_keys[..], &keys[..]);
assert_eq!(&s_keys[..], &keys[..]);
Ok(())
}
#[test]
fn failing_handshakes() {
use crate::crypto::handshake::{ClientHandshake, ServerHandshake};
let mut rng = testing_rng().rng_compat();
let relay_secret = StaticSecret::new(&mut rng);
let relay_public = PublicKey::from(&relay_secret);
let wrong_public = PublicKey::from([16_u8; 32]);
let relay_identity = RsaIdentity::from_bytes(&[12; 20]).unwrap();
let wrong_identity = RsaIdentity::from_bytes(&[13; 20]).unwrap();
let relay_ntpk = NtorPublicKey {
id: relay_identity,
pk: relay_public,
};
let relay_ntsk = NtorSecretKey {
pk: relay_ntpk.clone(),
sk: relay_secret,
};
let relay_ntsks = &[relay_ntsk];
let wrong_ntpk1 = NtorPublicKey {
id: wrong_identity,
pk: relay_public,
};
let wrong_ntpk2 = NtorPublicKey {
id: relay_identity,
pk: wrong_public,
};
let (_, handshake1) = NtorClient::client1(&mut rng, &wrong_ntpk1).unwrap();
let (_, handshake2) = NtorClient::client1(&mut rng, &wrong_ntpk2).unwrap();
let (st3, handshake3) = NtorClient::client1(&mut rng, &relay_ntpk).unwrap();
let ans1 = NtorServer::server(&mut rng, relay_ntsks, &handshake1);
let ans2 = NtorServer::server(&mut rng, relay_ntsks, &handshake2);
assert!(ans1.is_err());
assert!(ans2.is_err());
let (_, mut smsg) = NtorServer::server(&mut rng, relay_ntsks, &handshake3).unwrap();
smsg[60] ^= 7;
let ans3 = NtorClient::client2(st3, smsg);
assert!(ans3.is_err());
}
}