pq/libfreemkv
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handshake returning fake success on failure

Browse Source 
Previously returned HandshakeResult with zeros when all host certs
failed. Now returns None. Also propagates volume_id read failure
instead of silently using zeros.
This commit is contained in:
MattJackson
2026-04-15 01:54:58 +00:00
parent 7c59d063ee
commit 2f48877992
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disc/encrypt.rs
+6 -6
View File
@@ -29,8 +29,10 @@ impl Disc {
for hc in &keydb.host_certs { for hc in &keydb.host_certs {
match aacs::handshake::aacs_authenticate(session, &hc.private_key, &hc.certificate) { match aacs::handshake::aacs_authenticate(session, &hc.private_key, &hc.certificate) {
Ok(mut auth) => { Ok(mut auth) => {
let volume_id = let volume_id = match aacs::handshake::read_volume_id(session, &mut auth) {
aacs::handshake::read_volume_id(session, &mut auth).unwrap_or([0u8; 16]); Ok(vid) => vid,
Err(_) => return None, // handshake succeeded but can't read VID
};
let read_data_key = aacs::handshake::read_data_keys(session, &mut auth) let read_data_key = aacs::handshake::read_data_keys(session, &mut auth)
.ok() .ok()
.map(|(rdk, _)| rdk); .map(|(rdk, _)| rdk);
@@ -46,10 +48,8 @@ impl Disc {
} }
} }
} }
last_error.map(|_e| HandshakeResult { // All host certs failed — return None, not a fake success
volume_id: [0u8; 16], None
read_data_key: None,
})
} }
/// Resolve disc encryption — AACS 1.0, AACS 2.0, CSS, or none. /// Resolve disc encryption — AACS 1.0, AACS 2.0, CSS, or none.