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
|
//! Relay channel code.
//!
//! This contains relay specific channel code. In other words, everyting that a relay needs to
//! establish a channel according to the Tor protocol.
pub(crate) mod handshake;
use async_trait::async_trait;
use digest::Digest;
use futures::{AsyncRead, AsyncWrite, SinkExt};
use rand::Rng;
use safelog::Sensitive;
use std::net::{IpAddr, SocketAddr};
use std::ops::Deref;
use std::sync::Arc;
use std::time::UNIX_EPOCH;
use tracing::{instrument, trace};
use tor_cell::chancell::msg;
use tor_cert::{Ed25519Cert, rsa::RsaCrosscert};
use tor_error::internal;
use tor_linkspec::{ChannelMethod, OwnedChanTarget};
use tor_llcrypto as ll;
use tor_llcrypto::pk::{
ed25519::{Ed25519Identity, Ed25519SigningKey},
rsa::RsaIdentity,
};
use tor_relay_crypto::pk::RelayLinkSigningKeypair;
use tor_rtcompat::{CertifiedConn, CoarseTimeProvider, SleepProvider, StreamOps};
use crate::ClockSkew;
use crate::channel::handshake::{UnverifiedChannel, VerifiedChannel};
use crate::channel::{Channel, ChannelType, FinalizableChannel, Reactor, VerifiableChannel};
use crate::relay::channel::handshake::{AUTHTYPE_ED25519_SHA256_RFC5705, RelayResponderHandshake};
use crate::{Error, Result, channel::RelayInitiatorHandshake, memquota::ChannelAccount};
// TODO(relay): We should probably get those values from protover crate or some other
// crate that have all "network parameters" we support?
/// A list of link authentication that we support (LinkAuth).
pub(crate) static LINK_AUTH: &[u16] = &[AUTHTYPE_ED25519_SHA256_RFC5705];
/// The authentication cell received on the channel.
pub(crate) enum AuthenticationCell {
/// The AUTH_CHALLENGE. Only relay responder receives this.
AuthChallenge(msg::AuthChallenge),
/// The AUTHENTICATE. Only relay initiator receives this.
Authenticate(msg::Authenticate),
}
impl AuthenticationCell {
/// Return a reference to the [`msg::AuthChallenge`] or None if we are not.
fn auth_challenge(&self) -> Option<&msg::AuthChallenge> {
match self {
AuthenticationCell::AuthChallenge(c) => Some(c),
_ => None,
}
}
}
/// Object containing the key and certificate that basically identifies us as a relay. They are
/// used for channel authentication.
///
/// We use this intermediary object in order to not have tor-proto crate have access to the KeyMgr
/// meaning access to all keys. This restricts the view to what is needed.
#[expect(unused)] // TODO(relay). remove
pub struct RelayIdentities {
/// As a relay, our RSA identity key: KP_relayid_rsa
pub(crate) rsa_id: RsaIdentity,
/// As a relay, our Ed identity key: KP_relayid_ed
pub(crate) ed_id: Ed25519Identity,
/// As a relay, our link signing keypair.
pub(crate) link_sign_kp: RelayLinkSigningKeypair,
/// The Ed25519 identity signing cert (CertType 4)
pub(crate) cert_id_sign_ed: Ed25519Cert,
/// The Ed25519 signing TLS cert (CertType 5)
pub(crate) cert_sign_tls_ed: Ed25519Cert,
/// The Ed25519 signing link auth cert (CertType 6)
pub(crate) cert_sign_link_auth_ed: Ed25519Cert,
/// Legacy: the RSA identity X509 cert (CertType 2). We only have the bytes here as
/// create_legacy_rsa_id_cert() takes a key and gives us back the encoded cert.
pub(crate) cert_id_x509_rsa: Vec<u8>,
/// Legacy: the RSA identity cert (CertType 7)
pub(crate) cert_id_rsa: RsaCrosscert,
}
impl RelayIdentities {
/// Constructor.
#[allow(clippy::too_many_arguments)] // Yes, plethora of keys...
pub fn new(
rsa_id: RsaIdentity,
ed_id: Ed25519Identity,
link_sign_kp: RelayLinkSigningKeypair,
cert_id_sign_ed: Ed25519Cert,
cert_sign_tls_ed: Ed25519Cert,
cert_sign_link_auth_ed: Ed25519Cert,
cert_id_x509_rsa: Vec<u8>,
cert_id_rsa: RsaCrosscert,
) -> Self {
Self {
rsa_id,
ed_id,
link_sign_kp,
cert_id_sign_ed,
cert_sign_tls_ed,
cert_sign_link_auth_ed,
cert_id_x509_rsa,
cert_id_rsa,
}
}
}
impl RelayIdentities {
/// Return our Ed identity key (KP_relayid_ed) as bytes.
pub(crate) fn ed_id_bytes(&self) -> [u8; 32] {
self.ed_id.into()
}
/// Return the digest of the RSA x509 certificate (CertType 2) as bytes.
pub(crate) fn rsa_x509_digest(&self) -> [u8; 32] {
ll::d::Sha256::digest(&self.cert_id_x509_rsa).into()
}
}
/// Structure for building and launching a relay Tor channel.
#[derive(Default)]
#[non_exhaustive]
pub struct RelayChannelBuilder;
impl RelayChannelBuilder {
/// Constructor.
pub fn new() -> Self {
Self::default()
}
/// Launch a new handshake over a TLS stream.
///
/// After calling this function, you'll need to call `connect()` on the result to start the
/// handshake. If that succeeds, you'll have authentication info from the relay: call
/// `check()` on the result to check that. Finally, to finish the handshake, call `finish()`
/// on the result of _that_.
pub fn launch<T, S>(
self,
tls: T,
sleep_prov: S,
identities: Arc<RelayIdentities>,
my_addrs: Vec<IpAddr>,
memquota: ChannelAccount,
) -> RelayInitiatorHandshake<T, S>
where
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
{
RelayInitiatorHandshake::new(tls, sleep_prov, identities, my_addrs, memquota)
}
/// Accept a new handshake over a TLS stream.
pub fn accept<T, S>(
self,
peer: Sensitive<std::net::SocketAddr>,
my_addrs: Vec<IpAddr>,
tls: T,
sleep_prov: S,
identities: Arc<RelayIdentities>,
memquota: ChannelAccount,
) -> RelayResponderHandshake<T, S>
where
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
{
RelayResponderHandshake::new(peer, my_addrs, tls, sleep_prov, identities, memquota)
}
}
/// Channel authentication data. This is only relevant for a Relay to Relay channel which are
/// authenticated using this buffet of bytes.
#[derive(Debug)]
pub(crate) struct ChannelAuthenticationData {
/// Authentication method to use.
pub(crate) link_auth: u16,
/// SHA256 digest of the initiator KP_relayid_rsa.
pub(crate) cid: [u8; 32],
/// SHA256 digest of the responder KP_relayid_rsa.
pub(crate) sid: [u8; 32],
/// The initiator KP_relayid_ed.
pub(crate) cid_ed: [u8; 32],
/// The responder KP_relayid_ed.
pub(crate) sid_ed: [u8; 32],
/// Initiator log SHA256 digest.
pub(crate) clog: [u8; 32],
/// Responder log SHA256 digest.
pub(crate) slog: [u8; 32],
/// SHA256 of responder's TLS certificate.
pub(crate) scert: [u8; 32],
}
#[expect(unused)] // TODO(relay). remove
impl ChannelAuthenticationData {
/// Helper: return the authentication type string from the given link auth version.
const fn auth_type_bytes(link_auth: u16) -> Result<&'static [u8]> {
match link_auth {
3 => Ok(b"AUTH0003"),
_ => Err(Error::BadCellAuth),
}
}
/// Helper: return the keying material label from the given link auth version.
const fn keying_material_label_bytes(link_auth: u16) -> Result<&'static [u8]> {
match link_auth {
3 => Ok(b"EXPORTER FOR TOR TLS CLIENT BINDING AUTH0003"),
_ => Err(Error::BadCellAuth),
}
}
/// Consume ourself and return an AUTHENTICATE cell from the data we hold.
pub(crate) fn into_authenticate<C: CertifiedConn>(
self,
tls: &C,
link_ed: &RelayLinkSigningKeypair,
) -> Result<msg::Authenticate> {
// The body is exactly 352 bytes so optimize a bit memory.
let mut body = Vec::with_capacity(352);
// Obviously, ordering matteres. See tor-spec section Ed25519-SHA256-RFC5705
body.extend_from_slice(Self::auth_type_bytes(self.link_auth)?);
body.extend_from_slice(&self.cid);
body.extend_from_slice(&self.sid);
body.extend_from_slice(&self.cid_ed);
body.extend_from_slice(&self.sid_ed);
body.extend_from_slice(&self.slog);
body.extend_from_slice(&self.clog);
body.extend_from_slice(&self.scert);
// TLSSECRETS is built from the CID.
let tls_secrets = tls.export_keying_material(
32,
Self::keying_material_label_bytes(self.link_auth)?,
Some(&self.cid[..]),
)?;
body.extend_from_slice(tls_secrets.as_slice());
// Add the random bytes.
let mut rng = rand::rng();
let random: [u8; 24] = rand::rng().random();
body.extend_from_slice(&random);
// Create signature with our KP_link_ed and append it to body. We hard expect the
// KP_link_ed because this would be a code flow error.
let sig = link_ed.sign(&body);
body.extend_from_slice(&sig.to_bytes());
// Lets go with the AUTHENTICATE cell.
Ok(msg::Authenticate::new(self.link_auth, body))
}
}
/// A relay unverified channel which is a channel where the version has been negotiated and the
/// handshake has been done but where the certificates and keys have not been validated hence
/// unverified.
///
/// This is used for both initiator and responder channels.
struct UnverifiedRelayChannel<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> {
/// The common unverified channel that both client and relays use.
inner: UnverifiedChannel<T, S>,
/// The cell used for authentication received (AUTHENTICATE or AUTH_CHALLENGE). If None, this
/// channel won't authenticate.
///
/// When a channel does NOT authenticate, it means the initiator decided not to authenticate
/// and so as the initiator, we won't have an AUTHENTICATE and as the responder we won't have
/// an AUTH_CHALLENGE cell.
auth_cell: Option<AuthenticationCell>,
/// The netinfo cell that we got from the relay.
netinfo_cell: msg::Netinfo,
/// Our identity keys needed for authentication.
identities: Arc<RelayIdentities>,
/// Our advertised IP addresses.
my_addrs: Vec<IpAddr>,
}
impl<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> UnverifiedRelayChannel<T, S>
{
/// Build the [`ChannelAuthenticationData`] given a [`VerifiedChannel`].
///
/// We should never check or build authentication data if the channel is not verified thus the
/// requirement to pass the verified channel to this function.
///
/// Both initiator and responder handshake build this data in order to authenticate.
///
/// IMPORTANT: The CLOG and SLOG from the framed_tls codec is consumed here so calling twice
/// build_auth_data() will result in different AUTHENTICATE cells.
fn build_auth_data(
auth_challenge_cell: Option<&msg::AuthChallenge>,
identities: &Arc<RelayIdentities>,
verified: &mut VerifiedChannel<T, S>,
) -> Result<ChannelAuthenticationData> {
// With an AUTH_CHALLENGE, we are the Initiator. With an AUTHENTICATE, we are the
// Responder. See tor-spec for a diagram of messages.
let is_responder = auth_challenge_cell.is_none();
// Without an AUTH_CHALLENGE, we use our known link protocol value. Else, we only keep what
// we know from the AUTH_CHALLENGE and we max() on it.
let link_auth = *LINK_AUTH
.iter()
.filter(|m| auth_challenge_cell.is_none_or(|cell| cell.methods().contains(m)))
.max()
.ok_or(Error::BadCellAuth)?;
// The ordering matter based on if initiator or responder.
let cid = identities.rsa_x509_digest();
let sid = verified
.rsa_id_cert_digest
.ok_or(Error::from(internal!(
"Verified channel without a RSA identity"
)))?
.1;
let cid_ed = identities.ed_id_bytes();
let sid_ed = verified
.ed25519_id
.ok_or(Error::from(internal!(
"Verified channel without an ed25519 identity"
)))?
.into();
// Both values are consumed from the underlying codec.
let clog = verified.framed_tls.codec_mut().get_clog_digest()?;
let slog = verified.framed_tls.codec_mut().get_slog_digest()?;
let (cid, sid, cid_ed, sid_ed) = if is_responder {
// Reverse when responder as in CID becomes SID, and so on.
(sid, cid, sid_ed, cid_ed)
} else {
// Keep it that way if we are initiator.
(cid, sid, cid_ed, sid_ed)
};
let (clog, slog) = if is_responder {
// Reverse as the SLOG is the responder log digest meaning the clog as a responder.
(slog, clog)
} else {
// Keep ordering.
(clog, slog)
};
let scert = if is_responder {
// TODO(relay): This is the peer certificate but as a responder, we need our
// certificate which requires lot more work and a rustls provider configured as a
// server side. See arti#2316.
todo!()
} else {
verified.peer_cert_digest
};
Ok(ChannelAuthenticationData {
link_auth,
cid,
sid,
cid_ed,
sid_ed,
clog,
slog,
scert,
})
}
}
impl<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> VerifiableChannel<T, S> for UnverifiedRelayChannel<T, S>
{
fn clock_skew(&self) -> ClockSkew {
self.inner.clock_skew
}
#[instrument(skip_all, level = "trace")]
fn check(
self: Box<Self>,
peer: &OwnedChanTarget,
peer_cert: &[u8],
now: Option<std::time::SystemTime>,
) -> Result<Box<dyn FinalizableChannel<T, S>>> {
// We can't authenticate unless we have an Authentication cell.
//
// A clever observer can ask if this can be gamed to get an unverified relay channel
// considered as a canonical authenticate channel.
//
// The answer is no because when the handshake starts, Initiators always expect the other
// side to send a CERTS, AUTH_CHALLENGE and NETINFO. Else, an error is raised. Responder
// are the one dealing with unauthenticated channels and, for instance, if we receive a
// CERTS without an AUTHENTICATE , an error is raised.
//
// In other words, when a VerifiableChannel reaches this function, it either has what it
// needs to authenticate (relay<->relay channel) or not (client/bridge<->relay channel).
//
// An UnverifiedRelayChannel implements FinalizableChannel which enforces, with the type
// system, that an unverified channel will never become authenticated.
let Some(auth_cell) = self.auth_cell else {
return Ok(self);
};
// Get these object out as we consume "self" in the inner check().
let identities = self.identities;
let netinfo_cell = self.netinfo_cell;
let my_addrs = self.my_addrs;
let mut authenticate_cell = None;
// Verify our inner channel and then proceed to handle the authentication challenge if any.
let mut verified = self.inner.check(peer, peer_cert, now)?;
// By building the ChannelAuthenticationData, we are certain that the authentication
// type requested by the responder is supported by us.
let auth_data =
Self::build_auth_data(auth_cell.auth_challenge(), &identities, &mut verified)?;
let our_authenticate =
auth_data.into_authenticate(verified.framed_tls.deref(), &identities.link_sign_kp)?;
// CRITICAL: This if is what authenticates a channel on the responder side. We compare
// what we expected to what we received.
if let AuthenticationCell::Authenticate(received_authenticate) = auth_cell {
if received_authenticate != our_authenticate {
return Err(Error::ChanProto(
"AUTHENTICATE was unexpected. Failing authentication".into(),
));
}
// Keep it so we can send it to the other end.
authenticate_cell = Some(our_authenticate);
}
// This part is very important as we now flag that we are authenticated. The responder
// checks the received AUTHENTICATE and the initiator just needs to verify the channel.
//
// At this point, the underlying cell handler is in the Handshake state. Setting the
// channel type here as authenticated means that once the handler transition to the Open
// state, it will carry this authenticated flag leading to the message filter of the
// channel codec to adapt its restricted message sets (meaning R2R only).
//
// After this call, it is considered a R2R channel.
verified.set_authenticated()?;
Ok(Box::new(VerifiedRelayChannel {
inner: verified,
identities,
netinfo_cell,
authenticate_cell,
my_addrs,
}))
}
/// Return the link protocol version of this channel.
#[cfg(test)]
fn link_protocol(&self) -> u16 {
self.inner.link_protocol
}
}
#[async_trait]
impl<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> FinalizableChannel<T, S> for UnverifiedRelayChannel<T, S>
{
#[instrument(skip_all, level = "trace")]
async fn finish(mut self: Box<Self>) -> Result<(Arc<Channel>, Reactor<S>)> {
// NOTE: The only way to get here is if the channel is a relay responder.
//
// Initiators always authenticate and so only relay responder can end up with an unverified
// relay channel in the finish() state. Plausible future improvement here would be to have
// a more specific unverified responder channel type and so never an initiator handshake
// can lead to this function.
self.inner.finish()
}
}
impl<T, S> crate::channel::seal::Sealed for UnverifiedRelayChannel<T, S>
where
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
{
}
/// A verified relay channel on which versions have been negotiated, the handshake has been read,
/// but the relay has not yet finished the handshake.
///
/// This type is separate from UnverifiedRelayChannel, since finishing the handshake requires a
/// bunch of CPU, and you might want to do it as a separate task or after a yield.
#[expect(unused)] // TODO(relay). remove
struct VerifiedRelayChannel<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> {
/// The common unverified channel that both client and relays use.
inner: VerifiedChannel<T, S>,
/// Relay identities.
identities: Arc<RelayIdentities>,
/// The netinfo cell that we got from the relay.
netinfo_cell: msg::Netinfo,
/// The AUTHENTICATE cell we need to send back as a responder.
authenticate_cell: Option<msg::Authenticate>,
/// Our advertised IP addresses.
my_addrs: Vec<IpAddr>,
}
#[async_trait]
impl<
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
> FinalizableChannel<T, S> for VerifiedRelayChannel<T, S>
{
#[instrument(skip_all, level = "trace")]
async fn finish(mut self: Box<Self>) -> Result<(Arc<Channel>, Reactor<S>)> {
// TODO(relay): This would be the time to set a "is_canonical" flag to Channel which is
// true if the Netinfo address matches the address we are connected to. Canonical
// definition is if the address we are connected to is what we expect it to be. This only
// makes sense for relay channels.
// If we have an AUTHENTICATE cell, we need to send it along our CERTS and NETINFO. In
// other words, it means we are a Responder.
if let Some(auth_cell) = self.authenticate_cell {
// We got an AUTH_CHALLENGE, send the CERTS and AUTHENTICATE.
let certs = build_certs_cell(&self.identities, ChannelType::RelayInitiator);
trace!(channel_id = %self.inner.unique_id, "Sending CERTS as initiator cell.");
self.inner.framed_tls.send(certs.into()).await?;
trace!(channel_id = %self.inner.unique_id, "Sending AUTHENTICATE as initiator cell.");
self.inner.framed_tls.send(auth_cell.into()).await?;
let peer_ip = self
.inner
.target_method
.as_ref()
.and_then(ChannelMethod::socket_addrs)
.and_then(|addrs| addrs.first())
.map(SocketAddr::ip)
.ok_or(Error::from(internal!("Target method address invalid")))?;
let netinfo = build_netinfo_cell(peer_ip, self.my_addrs, &self.inner.sleep_prov)?;
trace!(channel_id = %self.inner.unique_id, "Sending NETINFO as initiator cell.");
self.inner.framed_tls.send(netinfo.into()).await?;
}
self.inner.finish().await
}
}
impl<T, S> crate::channel::seal::Sealed for VerifiedRelayChannel<T, S>
where
T: AsyncRead + AsyncWrite + CertifiedConn + StreamOps + Send + Unpin + 'static,
S: CoarseTimeProvider + SleepProvider,
{
}
/// Helper: Build a [`msg::Certs`] cell for the given relay identities and channel type.
///
/// Both relay initiator and responder handshake use this.
pub(crate) fn build_certs_cell(
identities: &Arc<RelayIdentities>,
_chan_type: ChannelType,
) -> msg::Certs {
let mut certs = msg::Certs::new_empty();
// Push into the cell the CertType 2 RSA
certs.push_cert_body(
tor_cert::CertType::RSA_ID_X509,
identities.cert_id_x509_rsa.clone(),
);
/* TODO(relay): Need to push these into the CERTS. The current types in RelayIdentities are
* wrong as they are not encodable. The types returned by the KeyMgr has encodable cert types
* so we'll use then when addressing this.
// Push into the cell the CertType 7 RSA
certs.push_cert_body(
self.identities.cert_id_rsa.cert_type(),
&self.identities.cert_id_rsa,
);
// Push into the cell the CertType 4 Ed25519
certs.push_cert_body(
self.identities.cert_id_sign_ed.cert_type(),
&self.identities.cert_id_sign_ed,
);
// Push into the cell the CertType 5/6 Ed25519
if chan_type.is_responder() {
// Responder has CertType 5
certs.push_cert_body(
self.identities.cert_sign_tls_ed.cert_type(),
&self.identities.cert_sign_tls_ed,
);
} else {
// Initiator has CertType 6
certs.push_cert_body(
self.identities.cert_sign_link_auth_ed.cert_type(),
&self.identities.cert_sign_link_auth_ed,
);
}
*/
certs
}
/// Build a [`msg::Netinfo`] cell from the given peer IPs and our advertised addresses.
///
/// Both relay initiator and responder handshake use this.
pub(crate) fn build_netinfo_cell<S>(
peer_ip: IpAddr,
my_addrs: Vec<IpAddr>,
sleep_prov: &S,
) -> Result<msg::Netinfo>
where
S: CoarseTimeProvider + SleepProvider,
{
// Unix timestamp but over 32bit. This will be sad in 2038 but proposal 338 addresses this
// issue with a change to 64bit.
let timestamp = sleep_prov
.wallclock()
.duration_since(UNIX_EPOCH)
.map_err(|e| internal!("Wallclock may have gone backwards: {e}"))?
.as_secs()
.try_into()
.map_err(|e| internal!("Wallclock secs fail to convert to 32bit: {e}"))?;
Ok(msg::Netinfo::from_relay(timestamp, Some(peer_ip), my_addrs))
}
|