rust/rustls
rust
/
rustls
mirror of https://github.com/ctz/rustls
1
0
Fork 0
Code Issues Releases Wiki Activity

aws-lc-rs: avoid chaha20poly1305 for ticketer algorithm

This commit is contained in:
Joseph Birr-Pixton 2023-10-06 11:54:54 +01:00
parent 82b1e3f1db
commit afe43b0213
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rustls/src/crypto/aws_lc_rs/mod.rs
View File

@ -205,3 +205,6 @@ mod ring_shim {
ring_like::signature::EcdsaKeyPair::from_pkcs8(alg, data).map_err(|_| ())
}
}
/// AEAD algorithm that is used by `mod ticketer`.
pub(super) static TICKETER_AEAD: &'static ring_like::aead::Algorithm = &ring_like::aead::AES_256_GCM;

4
rustls/src/crypto/ring/mod.rs
View File

@ -201,3 +201,7 @@ mod ring_shim {
ring_like::signature::EcdsaKeyPair::from_pkcs8(alg, data, rng).map_err(|_| ())
}
}
/// AEAD algorithm that is used by `mod ticketer`.
pub(super) static TICKETER_AEAD: &'static ring_like::aead::Algorithm =
&ring_like::aead::CHACHA20_POLY1305;

9
rustls/src/crypto/ring/ticketer.rs
View File

@ -6,6 +6,7 @@ use crate::server::ProducesTickets;
use super::ring_like::aead;
use super::ring_like::rand::{SecureRandom, SystemRandom};
use super::TICKETER_AEAD;
use alloc::boxed::Box;
use alloc::sync::Arc;
@ -20,7 +21,8 @@ impl Ticketer {
/// Make the recommended Ticketer. This produces tickets
/// with a 12 hour life and randomly generated keys.
///
/// The encryption mechanism used is Chacha20Poly1305.
/// The encryption mechanism used is injected via TICKETER_AEAD;
/// it must take a 256-bit key and 96-bit nonce.
pub fn new() -> Result<Arc<dyn ProducesTickets>, Error> {
Ok(Arc::new(crate::ticketer::TicketSwitcher::new(
6 * 60 * 60,
@ -35,11 +37,10 @@ fn make_ticket_generator() -> Result<Box<dyn ProducesTickets>, GetRandomFailed>
.fill(&mut key)
.map_err(|_| GetRandomFailed)?;
let alg = &aead::CHACHA20_POLY1305;
let key = aead::UnboundKey::new(alg, &key).unwrap();
let key = aead::UnboundKey::new(TICKETER_AEAD, &key).unwrap();
Ok(Box::new(AeadTicketer {
alg,
alg: TICKETER_AEAD,
key: aead::LessSafeKey::new(key),
lifetime: 60 * 60 * 12,
}))