From 4f6029e4d464b120b62a5098bebcdaa750a67944 Mon Sep 17 00:00:00 2001
From: Matthew Jackson <1085847+MattJackson@users.noreply.github.com>
Date: Fri, 10 Jul 2026 14:00:28 -0700
Subject: [PATCH] 1.3.2: carry UnitKey.variant_number (all sources emit 0)

Construct unit keys via UnitKey::new; ordinary content is variant 0. Inherits libfreemkv 1.3.2. No behaviour change.
---
 CHANGELOG.md         | 9 +++++++++
 Cargo.toml           | 2 +-
 src/keydb.rs         | 5 +----
 src/lib.rs           | 5 +----
 src/online.rs        | 2 +-
 tests/key_sources.rs | 5 +----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31d7ae4..13db5b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.3.2] — 2026-07-10
+
+### Changed
+
+- Unit keys carry libfreemkv's new `UnitKey.variant_number`; every source
+  (keydb, online, VUK-derived) emits `0` — ordinary, non-forensic content —
+  via the `UnitKey::new` constructor. No behaviour change. Inherits
+  **libfreemkv 1.3.2**.
+
 ## [1.3.1] — 2026-07-10
 
 ### Licensing
diff --git a/Cargo.toml b/Cargo.toml
index 89b6059..40f3448 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "freemkv-keysources"
-version = "1.3.1"
+version = "1.3.2"
 edition = "2024"
 rust-version = "1.86"
 license = "MIT"
diff --git a/src/keydb.rs b/src/keydb.rs
index a9f18b1..6cd3f4f 100644
--- a/src/keydb.rs
+++ b/src/keydb.rs
@@ -184,10 +184,7 @@ impl KeydbSource {
         // 1. Terminal Unit Keys stored in the entry — directly usable, no
         //    derivation. Preserve the keydb's CPS numbering (idx = num - 1).
         for (num, key) in &entry.unit_keys {
-            keys.push(UnitKey {
-                idx: num.saturating_sub(1),
-                key: *key,
-            });
+            keys.push(UnitKey::new(num.saturating_sub(1), *key));
         }
 
         // The disc's encrypted title keys (from Unit_Key_RO.inf) — what every
diff --git a/src/lib.rs b/src/lib.rs
index 84b2464..3421299 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,10 +47,7 @@ pub(crate) fn uks_from_vuk(vuk: &[u8; 16], enc_title_keys: &[[u8; 16]]) -> Vec<U
     enc_title_keys
         .iter()
         .enumerate()
-        .map(|(i, e)| UnitKey {
-            idx: i as u32,
-            key: libfreemkv::aacs::derive::decrypt_unit_key(vuk, e),
-        })
+        .map(|(i, e)| UnitKey::new(i as u32, libfreemkv::aacs::derive::decrypt_unit_key(vuk, e)))
         .collect()
 }
 
diff --git a/src/online.rs b/src/online.rs
index c18a12b..314f440 100644
--- a/src/online.rs
+++ b/src/online.rs
@@ -306,7 +306,7 @@ impl OnlineSource {
         // A terminal UK is used directly (CPS unit 0 → committed cps 1, matching
         // the old `Key::Unit(vec![(1, uk)])`).
         if let Some(uk) = json.get("UK").and_then(|u| u.as_str()).and_then(parse_uk) {
-            return vec![UnitKey { idx: 0, key: uk }];
+            return vec![UnitKey::new(0, uk)];
         }
         // A VUK is derived to the terminal keys locally, via the disc's
         // encrypted title keys from the context — the library owns the crypto.
diff --git a/tests/key_sources.rs b/tests/key_sources.rs
index fba1730..72f68a2 100644
--- a/tests/key_sources.rs
+++ b/tests/key_sources.rs
@@ -267,10 +267,7 @@ impl KeySource for ScriptedSource {
 }
 
 fn uk(b: u8) -> UnitKey {
-    UnitKey {
-        idx: 0,
-        key: [b; 16],
-    }
+    UnitKey::new(0, [b; 16])
 }
 
 #[test]