Noratrieb/tls
1
0
Fork 0
mirror of https://github.com/Noratrieb/tls.git synced 2026-01-15 00:55:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix several bugs

Browse source
This commit is contained in:
nora 2024-08-03 14:59:12 +02:00
parent 0f93d225e7
commit c518c09937
6 changed files with 99 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/crypto/mod.rs
View file

@ -36,14 +36,12 @@ impl TlsHasher for sha2::Sha384 {
pub struct CryptoProvider {
zeroed_of_hash_size: &'static [u8],
hkdf_extract: fn(salt: &[u8], ikm: &[u8]) -> Vec<u8>,
derive_secret: fn(secret: &[u8], label: &[u8], messages_hash: &[u8]) -> Vec<u8>,
}
impl CryptoProvider {
fn new<H: TlsHasher>() -> Self {
CryptoProvider {
zeroed_of_hash_size: H::ZEROED,
hkdf_extract: H::extract,
derive_secret: keys::derive_secret::<H>,
}
}
}
@ -51,7 +49,7 @@ impl CryptoProvider {
mod seq {
use std::cell::Cell;
use super::aead::Nonce;
use super::aead::{Nonce, TlsNonce};
/// The sequence ID generator.
/// There is a separate one maintained for reading and writing.
@ -71,10 +69,15 @@ mod seq {
// Don't implement `Clone` to ensure every seq id is only used once.
pub struct SeqId(u64);
impl SeqId {
pub fn to_nonce(self) -> Nonce {
pub fn to_nonce(self) -> TlsNonce {
// <https://datatracker.ietf.org/doc/html/rfc8446#section-5.3>
// 1. The 64-bit record sequence number is encoded in network byte
// order and padded to the left with zeros to iv_length.
let mut nonce = [0; 12];
nonce[4..].copy_from_slice(&self.0.to_be_bytes());
Nonce::from(nonce)
nonce[4..12].copy_from_slice(&self.0.to_be_bytes());
let nonce = Nonce::from(nonce);
TlsNonce::new(nonce)
}
}
}