Skip to content

Fix the build on modern Rust and stop advertising unimplementable AES-GCM suites #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DanGould wants to merge 3 commits into
base: main
Choose a base branch
from
+28 −32
Draft

Fix the build on modern Rust and stop advertising unimplementable AES-GCM suites #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cea048d
remove feature gated code from non-existent feature
nothingmuch Sep 16, 2025
ba508f8
Fix build on modern Rust after key-material redaction
DanGould Jul 21, 2026
50d7ce2
Stop advertising the unimplementable AES-GCM suites
DanGould Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions bhttp/src/err.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ pub enum Error {
ConnectUnsupported,
#[error("a field contained invalid Unicode: {0}")]
CharacterEncoding(#[from] std::string::FromUtf8Error),
#[error("a chunk of data of {0} bytes is too large")]
#[cfg(feature = "stream")]
ChunkTooLarge(u64),
#[error("read a response when expecting a request")]
ExpectedRequest,
#[error("read a request when expecting a response")]
Expand Down
26 changes: 14 additions & 12 deletions ohttp/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,9 @@ impl KeyConfig {
let key_id = r.read_u8()?;
let kem = Kem::try_from(r.read_u16::<NetworkEndian>()?)?;

// Note that the KDF and AEAD doesn't matter here.
let kem_config = HpkeConfig::new(kem, Kdf::HkdfSha256, AeadId::Aes128Gcm);
// Note that the KDF and AEAD doesn't matter here, but it has to be a
// supported pair or the check below rejects every config.
let kem_config = HpkeConfig::new(kem, Kdf::HkdfSha256, AeadId::ChaCha20Poly1305);
if !kem_config.supported() {
return Err(Error::Unsupported);
}
Expand Down Expand Up @@ -241,7 +242,7 @@ impl KeyConfig {
r.consume(len);
match res {
Ok(config) => configs.push(config),
Err(Error::Unsupported) => continue,
Err(Error::Unsupported) => {}
Err(e) => return Err(e),
}
}
Expand Down Expand Up @@ -278,10 +279,8 @@ mod test {

const KEY_ID: KeyId = 1;
const KEM: Kem = Kem::K256Sha256;
const SYMMETRIC: &[SymmetricSuite] = &[
SymmetricSuite::new(Kdf::HkdfSha256, Aead::Aes128Gcm),
SymmetricSuite::new(Kdf::HkdfSha256, Aead::ChaCha20Poly1305),
];
const SYMMETRIC: &[SymmetricSuite] =
&[SymmetricSuite::new(Kdf::HkdfSha256, Aead::ChaCha20Poly1305)];

#[test]
fn encode_decode_config_list() {
Expand Down Expand Up @@ -364,13 +363,16 @@ mod test {
fn truncate_kdf_aead_list() {
init();

let mut x25519 = KeyConfig::new(KEY_ID, KEM, Vec::from(SYMMETRIC))
let mut encoded = KeyConfig::new(KEY_ID, KEM, Vec::from(SYMMETRIC))
.unwrap()
.encode()
.unwrap();
x25519.truncate(38);
assert_eq!(usize::from(x25519[36]), SYMMETRIC.len() * 4);
x25519[36] = 1;
assert!(matches!(KeyConfig::decode(&x25519), Err(Error::Format)));
// The suite list sits at the end, preceded by its u16 length; derive the offset
// rather than hard-coding one, since the public key size depends on the KEM.
let len_lo = encoded.len() - SYMMETRIC.len() * 4 - 1;
assert_eq!(usize::from(encoded[len_lo]), SYMMETRIC.len() * 4);
// A length that isn't a whole number of suites must be rejected.
encoded[len_lo] = 1;
assert!(matches!(KeyConfig::decode(&encoded), Err(Error::Format)));
}
}
18 changes: 10 additions & 8 deletions ohttp/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,8 @@ mod test {

const KEY_ID: KeyId = 1;
const KEM: Kem = Kem::K256Sha256;
const SYMMETRIC: &[SymmetricSuite] = &[
SymmetricSuite::new(Kdf::HkdfSha256, Aead::Aes128Gcm),
SymmetricSuite::new(Kdf::HkdfSha256, Aead::ChaCha20Poly1305),
];
const SYMMETRIC: &[SymmetricSuite] =
&[SymmetricSuite::new(Kdf::HkdfSha256, Aead::ChaCha20Poly1305)];

const REQUEST: &[u8] = &[
0x00, 0x03, 0x47, 0x45, 0x54, 0x05, 0x68, 0x74, 0x74, 0x70, 0x73, 0x0b, 0x65, 0x78, 0x61,
Expand Down Expand Up @@ -473,11 +471,15 @@ mod test {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
];
// key_id 0x01, KEM 0x0016 (DHKEM secp256k1, HKDF-SHA256), a 65-byte uncompressed
// public key, then a 4-byte suite list of HKDF-SHA256 + ChaCha20Poly1305.
const EXPECTED_CONFIG: &[u8] = &[
0x01, 0x00, 0x20, 0xfc, 0x01, 0x38, 0x93, 0x64, 0x10, 0x31, 0x1a, 0x0c, 0x64, 0x1a,
0x5c, 0xa0, 0x86, 0x39, 0x1d, 0xe8, 0xe7, 0x03, 0x82, 0x33, 0x3f, 0x6d, 0x64, 0x49,
0x25, 0x21, 0xad, 0x7d, 0xc7, 0x8a, 0x5d, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01, 0x00,
0x01, 0x00, 0x03,
0x01, 0x00, 0x16, 0x04, 0x43, 0xa4, 0xf2, 0x16, 0x79, 0xd7, 0x31, 0x3b, 0x32, 0xbf,
0xc9, 0x8c, 0xb7, 0x75, 0xbd, 0xa9, 0xf8, 0x76, 0xb6, 0x0c, 0xe8, 0x92, 0xd1, 0xaf,
0xc9, 0xf6, 0xcf, 0x74, 0xb8, 0x15, 0xd3, 0x42, 0x74, 0xe3, 0xce, 0x9d, 0x68, 0x24,
0xa8, 0xc8, 0xa5, 0xf5, 0x45, 0x1c, 0x2a, 0x1c, 0xda, 0xda, 0x5d, 0x2d, 0x87, 0x48,
0xd5, 0x40, 0xdd, 0xb6, 0xa8, 0x37, 0x70, 0xca, 0x47, 0x13, 0x62, 0x27, 0x00, 0x04,
0x00, 0x01, 0x00, 0x03,
];

init();
Expand Down
13 changes: 4 additions & 9 deletions ohttp/src/rh/hpke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl Config {

pub fn supported(self) -> bool {
// TODO support more options
self.kdf == Kdf::HkdfSha256 && matches!(self.aead, Aead::Aes128Gcm | Aead::ChaCha20Poly1305)
self.kdf == Kdf::HkdfSha256 && self.aead == Aead::ChaCha20Poly1305
}
}

Expand Down Expand Up @@ -98,7 +98,7 @@ impl PrivateKey {

impl std::fmt::Debug for PrivateKey {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
if let Ok(b) = self.key_data() {
if self.key_data().is_ok() {
write!(f, "PrivateKey [REDACTED]")
} else {
write!(f, "Opaque PrivateKey")
Expand Down Expand Up @@ -401,7 +401,7 @@ pub fn generate_key_pair(kem: Kem) -> Res<(PrivateKey, PublicKey)> {
(PrivateKey::K256(sk), PublicKey::K256(pk))
}
};
trace!("Generated key pair: sk={:?} pk={:?}", sk, pk);
trace!("Generated key pair: sk={sk:?} pk={pk:?}");
Ok((sk, pk))
}

Expand All @@ -413,7 +413,7 @@ pub fn derive_key_pair(kem: Kem, ikm: &[u8]) -> Res<(PrivateKey, PublicKey)> {
(PrivateKey::K256(sk), PublicKey::K256(pk))
}
};
trace!("Derived key pair: sk={:?} pk={:?}", sk, pk);
trace!("Derived key pair: sk={sk:?} pk={pk:?}");
Ok((sk, pk))
}

Expand Down Expand Up @@ -462,11 +462,6 @@ mod test {
assert_eq!(&pt[..], PT);
}

#[test]
fn seal_open_gcm() {
seal_open(Aead::Aes128Gcm, Kem::K256Sha256);
}

#[test]
fn seal_open_chacha() {
seal_open(Aead::ChaCha20Poly1305, Kem::K256Sha256);
Expand Down
Loading