aacs: merge media_key + volume_key into derive.rs

The volume_key module was only 34 lines and is just the tail of the same
DK/PK -> MK -> VUK -> UK derivation ladder as media_key. Fold both into one
derive module so every aacs module is a substantial, distinct responsibility
(crypto/mkb/derive/inf/content/variant/resolve). Relocation only; logic hash
identical (95fb9924); 2210 tests green.
This commit is contained in:
Matthew Jackson
2026-07-04 14:14:56 -07:00
parent cdee9739fd
commit 84aaceceb7
6 changed files with 49 additions and 54 deletions
+2 -4
View File
@@ -1,10 +1,9 @@
//! AACS key resolution — VUK derivation, MKB processing, disc hash, unit key parsing.
use super::crypto::aes_ecb_decrypt;
use super::derive::*;
use super::inf::*;
use super::media_key::*;
use super::mkb::*;
use super::volume_key::*;
//
// Canonical form is `<category>1003` (low 16 bits `0x1003` is a fixed marker).
@@ -457,13 +456,12 @@ mod tests {
// This suite predates the module split; it white-box-tests items now living
// in sibling modules. Pull them all in so the tests keep exercising them.
use super::super::crypto::*;
use super::super::derive::*;
use super::super::inf::*;
use super::super::media_key::*;
use super::super::mkb::*;
use super::super::provider::SuppliedKey;
use super::super::types::DiscEntry;
use super::super::types::*;
use super::super::volume_key::*;
use super::*;
/// Audit #5: the `major` / `from_major` mapping is load-bearing for the