beaconcrypt 0.6.0

Cryptographic transport for C2 channels
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
// SPDX-License-Identifier: 0BSD

use crate::pqxdh::{AD_SIZE, derive_root_key_input, shared_secrets, zeroize_shared_secrets};
use crate::ratchet::{
	RatchetManager, RatchetStatus, decrypt_message_with_ratchet,
	decrypt_registration_message_with_ratchet, encrypt_message_with_ratchet,
	finish_initial_ratchet_kdf,
};
use crate::shared::DhSecret;
use beaconcrypt_core::pqxdh::{self as verified_pqxdh, start_beacon_candidate_ratchet_kdf};
use beaconcrypt_parse::{InitKex, decode_response};
use libsodium_rs::{crypto_kem, crypto_kx, crypto_scalarmult, crypto_sign, ensure_init};

enum BeaconState {
	Fresh {
		control: verified_pqxdh::BeaconFresh,
		prekey: crypto_kx::KeyPair,
		pq_key: crypto_kem::mlkem768::KeyPair,
	},
	FreshWithCoins {
		control: verified_pqxdh::BeaconFresh,
		prekey: crypto_kx::KeyPair,
		onetime_key: crypto_kx::KeyPair,
		pq_key: crypto_kem::mlkem768::KeyPair,
	},
	InitSent {
		control: verified_pqxdh::BeaconInitSent,
		prekey: crypto_kx::KeyPair,
		onetime_key: crypto_kx::KeyPair,
		pq_key: crypto_kem::mlkem768::KeyPair,
	},
	Established {
		control: verified_pqxdh::BeaconEstablished,
		associated_data: [u8; AD_SIZE],
		ratchet: RatchetManager,
	},
	Aborted {
		control: verified_pqxdh::BeaconAborted,
	},
}

/// Opaque beacon handle exposed by the C API and owned by its caller.
pub struct Beacon {
	identity_key: crypto_sign::KeyPair,
	identity_key_kid: u64,
	state: BeaconState,
	server_id: crypto_sign::PublicKey,
}

pub trait ProviderBeacon {
	fn get_registration_bundle(&mut self) -> Option<Vec<u8>>;
	fn finish_registration(&mut self, bytes: &[u8]) -> Option<Vec<u8>>;
}

impl Beacon {
	/// Construct a beacon, panicking if initialization, input validation or key generation fails.
	/// Use [`Self::try_new`] when inputs or dependency failures must be recoverable.
	pub fn new(server_kid: u64, server_id_pk: &[u8]) -> Self {
		Self::try_new(server_kid, server_id_pk).expect("Failed to construct beacon")
	}

	/// Construct a beacon without panicking on reported initialization, key-length or key-generation errors.
	/// Allocation failure and failures inside the native RNG remain process-level failures.
	pub fn try_new(server_kid: u64, server_id_pk: &[u8]) -> Result<Self, crate::KeyGenError> {
		ensure_init().map_err(|_| crate::KeyGenError)?;
		let id =
			crypto_sign::PublicKey::from_bytes(server_id_pk).map_err(|_| crate::KeyGenError)?;
		Ok(Self {
			identity_key: crypto_sign::KeyPair::generate().map_err(|_| crate::KeyGenError)?,
			identity_key_kid: server_kid,
			state: BeaconState::Fresh {
				control: verified_pqxdh::BeaconFresh::new(verified_pqxdh::ServerBinding {
					identity_public_key: *id.as_bytes(),
					identity_key_id: server_kid,
				}),
				prekey: crypto_kx::KeyPair::generate().map_err(|_| crate::KeyGenError)?,
				pq_key: crypto_kem::mlkem768::KeyPair::generate()
					.map_err(|_| crate::KeyGenError)?,
			},
			server_id: id,
		})
	}
	pub fn identity_key_kid(&self) -> u64 {
		self.identity_key_kid
	}
	pub fn identity_pk(&self) -> &crypto_sign::PublicKey {
		&self.identity_key.public_key
	}
	pub fn identity_sk(&self) -> &crypto_sign::SecretKey {
		&self.identity_key.secret_key
	}
	pub fn server_id(&self) -> &crypto_sign::PublicKey {
		&self.server_id
	}
	pub fn server_kid(&self) -> u64 {
		match &self.state {
			BeaconState::Fresh { control, .. } | BeaconState::FreshWithCoins { control, .. } => {
				control.server_key_id()
			}
			BeaconState::InitSent { control, .. } => control.server_key_id(),
			BeaconState::Established { control, .. } => control.server_key_id(),
			BeaconState::Aborted { control } => control.server_key_id(),
		}
	}
	pub fn pq_pk(&self) -> Option<&crypto_kem::mlkem768::PublicKey> {
		match &self.state {
			BeaconState::Fresh { pq_key, .. }
			| BeaconState::FreshWithCoins { pq_key, .. }
			| BeaconState::InitSent { pq_key, .. } => Some(&pq_key.public_key),
			_ => None,
		}
	}
	pub fn pq_sk(&self) -> Option<&crypto_kem::mlkem768::SecretKey> {
		match &self.state {
			BeaconState::Fresh { pq_key, .. }
			| BeaconState::FreshWithCoins { pq_key, .. }
			| BeaconState::InitSent { pq_key, .. } => Some(&pq_key.secret_key),
			_ => None,
		}
	}
	#[cfg(test)]
	pub(crate) fn ratchet_manager(&self) -> Option<&RatchetManager> {
		match &self.state {
			BeaconState::Established { ratchet, .. } => Some(ratchet),
			_ => None,
		}
	}
	pub fn associated_data(&self) -> Option<[u8; AD_SIZE]> {
		match self.state {
			BeaconState::Established {
				associated_data, ..
			} => Some(associated_data),
			_ => None,
		}
	}
	pub fn ratchet_status(&self) -> Option<RatchetStatus> {
		match &self.state {
			BeaconState::Established { ratchet, .. } => Some(ratchet.status()),
			_ => None,
		}
	}
	#[cfg(test)]
	pub(crate) fn set_associated_data(&mut self, data: [u8; AD_SIZE]) {
		if let BeaconState::Established {
			associated_data, ..
		} = &mut self.state
		{
			*associated_data = data
		}
	}
	pub fn encrypt_message(&mut self, b: &[u8]) -> Option<crate::Encrypted> {
		let sender = self.identity_key_kid;
		let BeaconState::Established {
			control,
			associated_data,
			ratchet,
		} = &mut self.state
		else {
			return None;
		};
		encrypt_message_with_ratchet(b, control.server_key_id(), sender, associated_data, ratchet)
	}
	pub fn decrypt_message(&mut self, b: &[u8]) -> Option<crate::Decrypted> {
		let BeaconState::Established {
			control,
			associated_data,
			ratchet,
		} = &mut self.state
		else {
			return None;
		};
		decrypt_message_with_ratchet(b, control.server_key_id(), associated_data, ratchet)
	}

	fn abort_registration(&mut self, control: verified_pqxdh::BeaconInitSent) {
		let server_kid = control.server_key_id();
		self.identity_key_kid = server_kid;
		self.state = BeaconState::Aborted {
			control: verified_pqxdh::beacon_abort_init(control),
		};
	}

	pub fn get_prekey_pk(&self) -> Option<&crypto_kx::PublicKey> {
		match &self.state {
			BeaconState::Fresh { prekey, .. }
			| BeaconState::FreshWithCoins { prekey, .. }
			| BeaconState::InitSent { prekey, .. } => Some(&prekey.public_key),
			_ => None,
		}
	}

	pub fn get_prekey_sk(&self) -> Option<&crypto_kx::SecretKey> {
		match &self.state {
			BeaconState::Fresh { prekey, .. }
			| BeaconState::FreshWithCoins { prekey, .. }
			| BeaconState::InitSent { prekey, .. } => Some(&prekey.secret_key),
			_ => None,
		}
	}

	pub fn get_onetime_pk(&self) -> Option<&crypto_kx::PublicKey> {
		match &self.state {
			BeaconState::FreshWithCoins { onetime_key, .. }
			| BeaconState::InitSent { onetime_key, .. } => Some(&onetime_key.public_key),
			_ => None,
		}
	}

	pub fn get_onetime_sk(&self) -> Option<&crypto_kx::SecretKey> {
		match &self.state {
			BeaconState::FreshWithCoins { onetime_key, .. }
			| BeaconState::InitSent { onetime_key, .. } => Some(&onetime_key.secret_key),
			_ => None,
		}
	}

	/// Pre-generate the explicit one-time registration coins.
	///
	/// This compatibility helper preserves the former public API while keeping
	/// the key in a dedicated fresh phase rather than an unrelated `Option`.
	pub fn new_onetime_keypair(&mut self) -> Option<()> {
		let onetime_key = crypto_kx::KeyPair::generate().ok()?;
		if let BeaconState::FreshWithCoins {
			onetime_key: current,
			..
		} = &mut self.state
		{
			*current = onetime_key;
			return Some(());
		}
		let control = match &self.state {
			BeaconState::Fresh { control, .. } => *control,
			_ => return None,
		};
		let fallback = BeaconState::Aborted {
			control: verified_pqxdh::beacon_abort_fresh(control),
		};
		let previous = std::mem::replace(&mut self.state, fallback);
		match previous {
			BeaconState::Fresh { prekey, pq_key, .. } => {
				self.state = BeaconState::FreshWithCoins {
					control,
					prekey,
					onetime_key,
					pq_key,
				};
				Some(())
			}
			other => {
				self.state = other;
				None
			}
		}
	}

	pub fn delete_onetime_keypair(&mut self) {
		let server_kid = self.server_kid();
		let phase = std::mem::replace(
			&mut self.state,
			BeaconState::Aborted {
				control: verified_pqxdh::BeaconAborted::new(server_kid),
			},
		);
		self.state = match phase {
			BeaconState::FreshWithCoins {
				control,
				prekey,
				pq_key,
				..
			} => BeaconState::Fresh {
				control,
				prekey,
				pq_key,
			},
			BeaconState::InitSent { control, .. } => BeaconState::Aborted {
				control: verified_pqxdh::beacon_abort_init(control),
			},
			other => other,
		};
	}

	pub fn delete_pq_keypair(&mut self) {
		let aborted = match &self.state {
			BeaconState::Fresh { control, .. } | BeaconState::FreshWithCoins { control, .. } => {
				Some(verified_pqxdh::beacon_abort_fresh(*control))
			}
			BeaconState::InitSent { control, .. } => {
				Some(verified_pqxdh::beacon_abort_init(*control))
			}
			_ => None,
		};
		if let Some(control) = aborted {
			self.state = BeaconState::Aborted { control };
		}
	}
}

impl ProviderBeacon for Beacon {
	fn get_registration_bundle(&mut self) -> Option<Vec<u8>> {
		let mut generated_onetime = if matches!(&self.state, BeaconState::Fresh { .. }) {
			Some(crypto_kx::KeyPair::generate().ok()?)
		} else {
			None
		};
		let (control, prekey_public, pq_public, onetime_public) = match &self.state {
			BeaconState::Fresh {
				control,
				prekey,
				pq_key,
			} => (
				*control,
				prekey.public_key.as_bytes().try_into().ok()?,
				*pq_key.public_key.as_bytes(),
				generated_onetime
					.as_ref()?
					.public_key
					.as_bytes()
					.try_into()
					.ok()?,
			),
			BeaconState::FreshWithCoins {
				control,
				prekey,
				onetime_key,
				pq_key,
			} => (
				*control,
				prekey.public_key.as_bytes().try_into().ok()?,
				*pq_key.public_key.as_bytes(),
				onetime_key.public_key.as_bytes().try_into().ok()?,
			),
			_ => return None,
		};
		let started = verified_pqxdh::beacon_start(
			control,
			verified_pqxdh::BeaconStartInputs {
				identity_public_key: *self.identity_pk().as_bytes(),
				prekey_public_key: prekey_public,
				pq_public_key: pq_public,
			},
			verified_pqxdh::BeaconCoins {
				one_time_public_key: onetime_public,
			},
		);
		let prekey_sig = crypto_sign::sign(started.message.prekey(), self.identity_sk()).ok()?;
		let onetime_sig =
			crypto_sign::sign(started.message.one_time_key(), self.identity_sk()).ok()?;
		let pq_sig = crypto_sign::sign(started.message.pq_key(), self.identity_sk()).ok()?;
		let buffer = crate::wire::encode_init(InitKex {
			identity_key: started.message.identity_key(),
			pre_key: &prekey_sig,
			one_time_key: &onetime_sig,
			pq_key: &pq_sig,
		})?;

		let fallback = BeaconState::Aborted {
			control: verified_pqxdh::beacon_abort_fresh(control),
		};
		let previous = std::mem::replace(&mut self.state, fallback);
		match previous {
			BeaconState::Fresh { prekey, pq_key, .. } => {
				let Some(onetime_key) = generated_onetime.take() else {
					self.state = BeaconState::Fresh {
						control,
						prekey,
						pq_key,
					};
					return None;
				};
				self.state = BeaconState::InitSent {
					control: started.state,
					prekey,
					onetime_key,
					pq_key,
				};
			}
			BeaconState::FreshWithCoins {
				prekey,
				onetime_key,
				pq_key,
				..
			} => {
				self.state = BeaconState::InitSent {
					control: started.state,
					prekey,
					onetime_key,
					pq_key,
				};
			}
			other => {
				self.state = other;
				return None;
			}
		}
		Some(buffer)
	}

	/// Returns the server's intitial message or a single 0xFF byte if the server didn't provide one. A return value of `None` MUST be treated as a protocol failure
	fn finish_registration(&mut self, bytes: &[u8]) -> Option<Vec<u8>> {
		let control = match &self.state {
			BeaconState::InitSent { control, .. } => *control,
			_ => return None,
		};

		let staged = (|| {
			let (prekey_secret, onetime_secret, pq_secret) = match &self.state {
				BeaconState::InitSent {
					prekey,
					onetime_key,
					pq_key,
					..
				} => (
					&prekey.secret_key,
					&onetime_key.secret_key,
					&pq_key.secret_key,
				),
				_ => return None,
			};
			let response = decode_response(bytes)?;
			let kem_ciphertext =
				crypto_kem::mlkem768::Ciphertext::from_bytes(response.kem_cipher_text).ok()?;
			let ephemeral = crypto_kx::PublicKey::from_bytes(response.ephemeral_key).ok()?;
			let response_server = crypto_sign::PublicKey::from_bytes(response.identity_key).ok()?;
			let server_kex_id = crypto_sign::ed25519_pk_to_curve25519(&response_server).ok()?;
			let beacon_kex_id = crypto_sign::ed25519_sk_to_curve25519(self.identity_sk()).ok()?;
			let kem_shared = crypto_kem::mlkem768::decapsulate(&kem_ciphertext, pq_secret).ok()?;
			let dh1: DhSecret =
				crypto_scalarmult::scalarmult(prekey_secret.as_bytes(), &server_kex_id)
					.ok()?
					.into();
			let dh2: DhSecret = crypto_scalarmult::scalarmult(&beacon_kex_id, ephemeral.as_bytes())
				.ok()?
				.into();
			let dh3: DhSecret =
				crypto_scalarmult::scalarmult(prekey_secret.as_bytes(), ephemeral.as_bytes())
					.ok()?
					.into();
			let dh4: DhSecret =
				crypto_scalarmult::scalarmult(onetime_secret.as_bytes(), ephemeral.as_bytes())
					.ok()?
					.into();
			let mut finish_inputs = verified_pqxdh::BeaconFinishInputs {
				response_server_identity: *response_server.as_bytes(),
				assigned_key_id: response.key_id,
				shared_secrets: shared_secrets(dh1, dh2, dh3, dh4, &kem_shared)?,
			};
			let prepared = verified_pqxdh::beacon_prepare_finish(control, &finish_inputs);
			zeroize_shared_secrets(&mut finish_inputs.shared_secrets);
			let mut candidate = prepared.ok()?;
			let derived_secret = derive_root_key_input(candidate.root_key_input_mut())?;
			let pending = start_beacon_candidate_ratchet_kdf(&candidate, derived_secret.as_array());
			let mut ratchet = RatchetManager::from_kernel(finish_initial_ratchet_kdf(pending));
			let associated_data = *candidate.associated_data();
			let decrypted = decrypt_registration_message_with_ratchet(
				response.app_cipher_text,
				candidate.server_key_id(),
				&associated_data,
				&mut ratchet,
			)?;
			if decrypted.seq != 1 {
				return None;
			}
			let authenticated_server_key_id = decrypted.key_id;
			let mut authenticated_plaintext = decrypted.plaintext;
			if authenticated_plaintext.len() <= verified_pqxdh::REGISTRATION_KEY_ID_BINDING_SIZE {
				return None;
			}
			let plaintext =
				authenticated_plaintext.split_off(verified_pqxdh::REGISTRATION_KEY_ID_BINDING_SIZE);
			let binding = authenticated_plaintext.as_slice().try_into().ok()?;
			let authenticated = verified_pqxdh::authenticate_registration_key_id_binding(
				candidate,
				authenticated_server_key_id,
				binding,
			)
			.ok()?;
			Some((authenticated, associated_data, ratchet, plaintext))
		})();

		let Some((authenticated, associated_data, ratchet, plaintext)) = staged else {
			self.abort_registration(control);
			return None;
		};

		let server_binding = authenticated.server_binding();
		let server_kid = server_binding.identity_key_id;
		if self.server_kid() != server_kid {
			self.abort_registration(control);
			return None;
		}
		if self.server_id.as_bytes() != &server_binding.identity_public_key {
			self.abort_registration(control);
			return None;
		}
		self.identity_key_kid = authenticated.assigned_key_id();
		self.state = BeaconState::Established {
			control: verified_pqxdh::beacon_commit(authenticated),
			associated_data,
			ratchet,
		};
		Some(plaintext)
	}
}

#[cfg(all(test, feature = "server"))]
mod tests {
	use super::*;
	use crate::{ProviderServer, Server};

	#[test]
	fn first_sequence_still_requires_nonempty_bound_plaintext() {
		for case in 0..10 {
			let mut server = Server::new(0, None);
			let mut beacon = Beacon::new(0, server.identity_pk().as_bytes());
			let init = beacon.get_registration_bundle().unwrap();
			let accepted = server.get_shared_secret(&init).unwrap();
			// A test-only sender at the actual initial chain lets malformed plaintext reach the binding checks at sequence one.
			let pending =
				verified_pqxdh::start_server_ratchet_kdf(accepted.derived_secret.as_array());
			let mut sender = RatchetManager::from_kernel(finish_initial_ratchet_kdf(pending));
			let ad = verified_pqxdh::build_associated_data(
				*server.identity_pk().as_bytes(),
				*beacon.identity_pk().as_bytes(),
			);
			let original = server.build_registration_response(accepted, None).unwrap();
			let payload = if case < 8 {
				original.kid.to_le_bytes()[..case + 1].to_vec()
			} else {
				let claimed = if case == 8 {
					original.kid + 1
				} else {
					original.kid
				};
				let mut payload = claimed.to_le_bytes().to_vec();
				payload.push(0x7e);
				payload
			};
			let frame =
				encrypt_message_with_ratchet(&payload, original.kid, 0, &ad, &mut sender).unwrap();
			assert_eq!(sender.status().send_sequence(), 1);
			let raw_frame = beaconcrypt_parse::decode_frame(&frame.ciphertext).unwrap();
			let response = decode_response(&original.serialized).unwrap();
			let serialized = crate::wire::encode_response(beaconcrypt_parse::KexResponse {
				identity_key: response.identity_key,
				ephemeral_key: response.ephemeral_key,
				kem_cipher_text: response.kem_cipher_text,
				key_id: original.kid,
				app_cipher_text: raw_frame.cipher_text,
			})
			.unwrap();
			let opened = beacon.finish_registration(&serialized);
			if case == 9 {
				assert_eq!(opened, Some(vec![0x7e]));
				assert_eq!(beacon.ratchet_status().unwrap().receive_sequence(), 1);
			} else {
				assert!(opened.is_none(), "malformed plaintext case {case}");
				assert!(beacon.ratchet_status().is_none());
				assert!(beacon.finish_registration(&original.serialized).is_none());
			}
		}
	}
}