openmls/schedule/psk.rs
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
//! # Preshared keys.
use std::borrow::Borrow;
use openmls_traits::{random::OpenMlsRand, storage::StorageProvider as StorageProviderTrait};
use serde::{Deserialize, Serialize};
use tls_codec::{Serialize as TlsSerializeTrait, VLBytes};
use super::*;
use crate::{
group::{GroupEpoch, GroupId},
schedule::psk::store::ResumptionPskStore,
storage::{OpenMlsProvider, StorageProvider},
};
/// Resumption PSK usage.
///
/// ```c
/// // draft-ietf-mls-protocol-19
/// enum {
/// reserved(0),
/// application(1),
/// reinit(2),
/// branch(3),
/// (255)
/// } ResumptionPSKUsage;
/// ```
#[derive(
Clone,
Copy,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Hash,
Deserialize,
Serialize,
TlsDeserialize,
TlsDeserializeBytes,
TlsSerialize,
TlsSize,
)]
#[repr(u8)]
pub enum ResumptionPskUsage {
/// Application.
Application = 1,
/// Resumption PSK used for group reinitialization.
///
/// Note: "Resumption PSKs with usage `reinit` MUST NOT be used in other contexts (than reinitialization)."
Reinit = 2,
/// Resumption PSK used for subgroup branching.
///
/// Note: "Resumption PSKs with usage `branch` MUST NOT be used in other contexts (than subgroup branching)."
Branch = 3,
}
/// External PSK.
#[derive(
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Clone,
Hash,
Deserialize,
Serialize,
TlsDeserialize,
TlsDeserializeBytes,
TlsSerialize,
TlsSize,
)]
pub struct ExternalPsk {
psk_id: VLBytes,
}
impl ExternalPsk {
/// Create a new `ExternalPsk` from a PSK ID
pub fn new(psk_id: Vec<u8>) -> Self {
Self {
psk_id: psk_id.into(),
}
}
/// Return the PSK ID
pub fn psk_id(&self) -> &[u8] {
self.psk_id.as_slice()
}
}
/// Contains the secret part of the PSK as well as the
/// public part that is used as a marker for injection into the key schedule.
#[derive(Serialize, Deserialize, TlsDeserialize, TlsDeserializeBytes, TlsSerialize, TlsSize)]
pub(crate) struct PskBundle {
secret: Secret,
}
/// Resumption PSK.
#[derive(
Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Deserialize,
Serialize,
TlsDeserialize,
TlsDeserializeBytes,
TlsSerialize,
TlsSize,
)]
pub struct ResumptionPsk {
pub(crate) usage: ResumptionPskUsage,
pub(crate) psk_group_id: GroupId,
pub(crate) psk_epoch: GroupEpoch,
}
impl ResumptionPsk {
/// Create a new `ResumptionPsk`
pub fn new(usage: ResumptionPskUsage, psk_group_id: GroupId, psk_epoch: GroupEpoch) -> Self {
Self {
usage,
psk_group_id,
psk_epoch,
}
}
/// Return the usage
pub fn usage(&self) -> ResumptionPskUsage {
self.usage
}
/// Return the `GroupId`
pub fn psk_group_id(&self) -> &GroupId {
&self.psk_group_id
}
/// Return the `GroupEpoch`
pub fn psk_epoch(&self) -> GroupEpoch {
self.psk_epoch
}
}
/// The different PSK types.
#[derive(
Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Deserialize,
Serialize,
TlsDeserialize,
TlsDeserializeBytes,
TlsSerialize,
TlsSize,
)]
#[repr(u8)]
pub enum Psk {
/// An external PSK provided by the application.
#[tls_codec(discriminant = 1)]
External(ExternalPsk),
/// A resumption PSK derived from the MLS key schedule.
#[tls_codec(discriminant = 2)]
Resumption(ResumptionPsk),
}
/// ```c
/// // draft-ietf-mls-protocol-19
/// enum {
/// reserved(0),
/// external(1),
/// resumption(2),
/// (255)
/// } PSKType;
/// ```
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
#[repr(u8)]
pub enum PskType {
/// An external PSK.
External = 1,
/// A resumption PSK.
Resumption = 2,
}
/// A `PreSharedKeyID` is used to uniquely identify the PSKs that get injected
/// in the key schedule.
///
/// ```c
/// // draft-ietf-mls-protocol-19
/// struct {
/// PSKType psktype;
/// select (PreSharedKeyID.psktype) {
/// case external:
/// opaque psk_id<V>;
///
/// case resumption:
/// ResumptionPSKUsage usage;
/// opaque psk_group_id<V>;
/// uint64 psk_epoch;
/// };
/// opaque psk_nonce<V>;
/// } PreSharedKeyID;
/// ```
#[derive(
Clone,
Debug,
PartialEq,
Eq,
PartialOrd,
Ord,
Deserialize,
Serialize,
TlsDeserialize,
TlsDeserializeBytes,
TlsSerialize,
TlsSize,
)]
pub struct PreSharedKeyId {
pub(crate) psk: Psk,
pub(crate) psk_nonce: VLBytes,
}
impl PreSharedKeyId {
/// Construct a `PreSharedKeyID` with a random nonce.
pub fn new(
ciphersuite: Ciphersuite,
rand: &impl OpenMlsRand,
psk: Psk,
) -> Result<Self, CryptoError> {
let psk_nonce = rand
.random_vec(ciphersuite.hash_length())
.map_err(|_| CryptoError::InsufficientRandomness)?
.into();
Ok(Self { psk, psk_nonce })
}
/// Construct an external `PreSharedKeyID`.
pub fn external(psk_id: Vec<u8>, psk_nonce: Vec<u8>) -> Self {
let psk = Psk::External(ExternalPsk::new(psk_id));
Self {
psk,
psk_nonce: psk_nonce.into(),
}
}
/// Construct a resumption `PreSharedKeyID`.
pub fn resumption(
usage: ResumptionPskUsage,
psk_group_id: GroupId,
psk_epoch: GroupEpoch,
psk_nonce: Vec<u8>,
) -> Self {
let psk = Psk::Resumption(ResumptionPsk::new(usage, psk_group_id, psk_epoch));
Self {
psk,
psk_nonce: psk_nonce.into(),
}
}
/// Return the PSK.
pub fn psk(&self) -> &Psk {
&self.psk
}
/// Return the PSK nonce.
pub fn psk_nonce(&self) -> &[u8] {
self.psk_nonce.as_slice()
}
// ----- Key Store -----------------------------------------------------------------------------
/// Save this `PreSharedKeyId` in the keystore.
///
/// Note: The nonce is not saved as it must be unique for each time it's being applied.
pub fn store<Provider: OpenMlsProvider>(
&self,
provider: &Provider,
psk: &[u8],
) -> Result<(), PskError> {
let psk_bundle = {
let secret = Secret::from_slice(psk);
PskBundle { secret }
};
provider
.storage()
.write_psk(&self.psk, &psk_bundle)
.map_err(|_| PskError::Storage)
}
// ----- Validation ----------------------------------------------------------------------------
pub(crate) fn validate_in_proposal(self, ciphersuite: Ciphersuite) -> Result<Self, PskError> {
// ValSem402
match self.psk() {
Psk::Resumption(resumption_psk) => {
if resumption_psk.usage != ResumptionPskUsage::Application {
return Err(PskError::UsageMismatch {
allowed: vec![ResumptionPskUsage::Application],
got: resumption_psk.usage,
});
}
}
Psk::External(_) => {}
};
// ValSem401
{
let expected_nonce_length = ciphersuite.hash_length();
let got_nonce_length = self.psk_nonce().len();
if expected_nonce_length != got_nonce_length {
return Err(PskError::NonceLengthMismatch {
expected: expected_nonce_length,
got: got_nonce_length,
});
}
}
Ok(self)
}
}
#[cfg(test)]
impl PreSharedKeyId {
pub(crate) fn new_with_nonce(psk: Psk, psk_nonce: Vec<u8>) -> Self {
Self {
psk,
psk_nonce: psk_nonce.into(),
}
}
}
/// `PskLabel` is used in the final concatentation of PSKs before they are
/// injected in the key schedule.
///
/// ```c
/// // draft-ietf-mls-protocol-19
/// struct {
/// PreSharedKeyID id;
/// uint16 index;
/// uint16 count;
/// } PSKLabel;
/// ```
#[derive(TlsSerialize, TlsSize)]
pub(crate) struct PskLabel<'a> {
pub(crate) id: &'a PreSharedKeyId,
pub(crate) index: u16,
pub(crate) count: u16,
}
impl<'a> PskLabel<'a> {
/// Create a new `PskLabel`
fn new(id: &'a PreSharedKeyId, index: u16, count: u16) -> Self {
Self { id, index, count }
}
}
/// This contains the `psk-secret` calculated from the PSKs contained in a
/// Commit or a PreSharedKey proposal.
#[derive(Clone)]
pub struct PskSecret {
secret: Secret,
}
impl PskSecret {
/// Create a new `PskSecret` from PSK IDs and PSKs
///
/// ```text
/// psk_extracted_[i] = KDF.Extract(0, psk_[i])
/// psk_input_[i] = ExpandWithLabel(psk_extracted_[i], "derived psk", PSKLabel, KDF.Nh)
///
/// psk_secret_[0] = 0
/// psk_secret_[i] = KDF.Extract(psk_input[i-1], psk_secret_[i-1])
/// psk_secret = psk_secret[n]
/// ```
pub(crate) fn new(
crypto: &impl OpenMlsCrypto,
ciphersuite: Ciphersuite,
psks: Vec<(impl Borrow<PreSharedKeyId>, Secret)>,
) -> Result<Self, PskError> {
// Check that we don't have too many PSKs
let num_psks = u16::try_from(psks.len()).map_err(|_| PskError::TooManyKeys)?;
// Following comments are from `draft-ietf-mls-protocol-19`.
//
// psk_secret_[0] = 0
let mut psk_secret = Secret::zero(ciphersuite);
for (index, (psk_id, psk)) in psks.into_iter().enumerate() {
// psk_extracted_[i] = KDF.Extract(0, psk_[i])
let psk_extracted = {
let zero_secret = Secret::zero(ciphersuite);
zero_secret
.hkdf_extract(crypto, ciphersuite, &psk)
.map_err(LibraryError::unexpected_crypto_error)?
};
// psk_input_[i] = ExpandWithLabel( psk_extracted_[i], "derived psk", PSKLabel, KDF.Nh)
let psk_input = {
let psk_label = PskLabel::new(psk_id.borrow(), index as u16, num_psks)
.tls_serialize_detached()
.map_err(LibraryError::missing_bound_check)?;
psk_extracted
.kdf_expand_label(
crypto,
ciphersuite,
"derived psk",
&psk_label,
ciphersuite.hash_length(),
)
.map_err(LibraryError::unexpected_crypto_error)?
};
// psk_secret_[i] = KDF.Extract(psk_input_[i-1], psk_secret_[i-1])
psk_secret = psk_input
.hkdf_extract(crypto, ciphersuite, &psk_secret)
.map_err(LibraryError::unexpected_crypto_error)?;
}
Ok(Self { secret: psk_secret })
}
/// Return the inner secret
pub(crate) fn secret(&self) -> &Secret {
&self.secret
}
#[cfg(any(feature = "test-utils", feature = "crypto-debug", test))]
pub(crate) fn as_slice(&self) -> &[u8] {
self.secret.as_slice()
}
}
#[cfg(any(feature = "test-utils", test))]
impl From<Secret> for PskSecret {
fn from(secret: Secret) -> Self {
Self { secret }
}
}
pub(crate) fn load_psks<'p, Storage: StorageProvider>(
storage: &Storage,
resumption_psk_store: &ResumptionPskStore,
psk_ids: &'p [PreSharedKeyId],
) -> Result<Vec<(&'p PreSharedKeyId, Secret)>, PskError> {
let mut psk_bundles = Vec::new();
for psk_id in psk_ids.iter() {
log_crypto!(trace, "PSK store {:?}", resumption_psk_store);
match &psk_id.psk {
Psk::Resumption(resumption) => {
if let Some(psk_bundle) = resumption_psk_store.get(resumption.psk_epoch()) {
psk_bundles.push((psk_id, psk_bundle.secret.clone()));
} else {
return Err(PskError::KeyNotFound);
}
}
Psk::External(_) => {
let psk_bundle: Option<PskBundle> = storage
.psk(psk_id.psk())
.map_err(|_| PskError::KeyNotFound)?;
if let Some(psk_bundle) = psk_bundle {
psk_bundles.push((psk_id, psk_bundle.secret));
} else {
return Err(PskError::KeyNotFound);
}
}
}
}
Ok(psk_bundles)
}
/// This module contains a store that can hold a rollover list of resumption PSKs.
pub mod store {
use serde::{Deserialize, Serialize};
use crate::{group::GroupEpoch, schedule::ResumptionPskSecret};
/// Resumption PSK store.
///
/// This is where the resumption PSKs are kept in a rollover list.
#[derive(Debug, Serialize, Deserialize)]
#[cfg_attr(any(test, feature = "test-utils"), derive(Clone, PartialEq))]
pub(crate) struct ResumptionPskStore {
max_number_of_secrets: usize,
resumption_psk: Vec<(GroupEpoch, ResumptionPskSecret)>,
cursor: usize,
}
impl ResumptionPskStore {
/// Creates a new store with a given maximum size of `number_of_secrets`.
pub(crate) fn new(max_number_of_secrets: usize) -> Self {
Self {
max_number_of_secrets,
resumption_psk: vec![],
cursor: 0,
}
}
/// Adds a new entry to the store.
pub(crate) fn add(&mut self, epoch: GroupEpoch, resumption_psk: ResumptionPskSecret) {
if self.max_number_of_secrets == 0 {
return;
}
let item = (epoch, resumption_psk);
if self.resumption_psk.len() < self.max_number_of_secrets {
self.resumption_psk.push(item);
self.cursor += 1;
} else {
self.cursor += 1;
self.cursor %= self.resumption_psk.len();
self.resumption_psk[self.cursor] = item;
}
}
/// Searches an entry for a given epoch number and if found, returns the
/// corresponding resumption psk.
pub(crate) fn get(&self, epoch: GroupEpoch) -> Option<&ResumptionPskSecret> {
self.resumption_psk
.iter()
.find(|&(e, _s)| e == &epoch)
.map(|(_e, s)| s)
}
}
#[cfg(test)]
impl ResumptionPskStore {
pub(crate) fn cursor(&self) -> usize {
self.cursor
}
}
}