From ad220dbc915b155f673f2664ba88cbbd161a0e51 Mon Sep 17 00:00:00 2001 From: Jan Starke Date: Fri, 12 Apr 2024 11:15:42 +0200 Subject: [PATCH 1/2] export the base block, too --- Cargo.lock | 12 ++++++------ Cargo.toml | 4 ++-- src/bin/cleanhive/main.rs | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fa3946..32406e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -702,7 +702,7 @@ dependencies = [ [[package]] name = "dfir-toolkit" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "assert-json-diff", @@ -742,7 +742,7 @@ dependencies = [ "more-asserts", "nt_hive2", "num", - "num-derive 0.4.0", + "num-derive 0.3.3", "num-traits", "ouroboros", "phf", @@ -1581,9 +1581,9 @@ dependencies = [ [[package]] name = "memoverlay" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320146b1366d0d61e342c22290a727191a4e4b5335ac7127314e03bed1274cab" +checksum = "4fc3283db27665ac5cbeef50846f5fbff8884c91f72b0c28f4ce6783050be939" dependencies = [ "thiserror", ] @@ -1640,9 +1640,9 @@ dependencies = [ [[package]] name = "nt_hive2" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3cbbe0f64268e0aa9854af0adf3013769750880f72985efa71fa031b59f1349" +checksum = "a05582cdbafd1b4599d5aa871608e80f663fe8bf05e753dd8588322d0fbadc07" dependencies = [ "anyhow", "binread", diff --git a/Cargo.toml b/Cargo.toml index c3185d0..53af679 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dfir-toolkit" -version = "0.10.1" +version = "0.10.2" edition = "2021" authors = ["Jan Starke ", "Deborah Mahn "] description = "CLI tools for digital forensics and incident response" @@ -168,7 +168,7 @@ strum = { version = "0", features = ["derive"], optional=true } strum_macros = {version="0", optional=true} # nt-hive2 -nt_hive2 = {version="4.0.2", optional=true} +nt_hive2 = {version="4.1.0", optional=true} # lnk2bodyfile lnk = {version="0.5.1", optional=true} diff --git a/src/bin/cleanhive/main.rs b/src/bin/cleanhive/main.rs index 7041660..558708f 100644 --- a/src/bin/cleanhive/main.rs +++ b/src/bin/cleanhive/main.rs @@ -42,6 +42,7 @@ pub fn main() -> Result<()> { } }; + clean_hive.write_baseblock(&mut cli.dst_hive)?; std::io::copy(&mut clean_hive, &mut cli.dst_hive)?; Ok(()) } From 462f371729fc19c38be44c648881e3eba21f83c0 Mon Sep 17 00:00:00 2001 From: Jan Starke Date: Fri, 12 Apr 2024 11:15:42 +0200 Subject: [PATCH 2/2] fix #33: export the base block, too --- Cargo.lock | 12 ++++++------ Cargo.toml | 4 ++-- src/bin/cleanhive/main.rs | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fa3946..32406e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -702,7 +702,7 @@ dependencies = [ [[package]] name = "dfir-toolkit" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "assert-json-diff", @@ -742,7 +742,7 @@ dependencies = [ "more-asserts", "nt_hive2", "num", - "num-derive 0.4.0", + "num-derive 0.3.3", "num-traits", "ouroboros", "phf", @@ -1581,9 +1581,9 @@ dependencies = [ [[package]] name = "memoverlay" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320146b1366d0d61e342c22290a727191a4e4b5335ac7127314e03bed1274cab" +checksum = "4fc3283db27665ac5cbeef50846f5fbff8884c91f72b0c28f4ce6783050be939" dependencies = [ "thiserror", ] @@ -1640,9 +1640,9 @@ dependencies = [ [[package]] name = "nt_hive2" -version = "4.0.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3cbbe0f64268e0aa9854af0adf3013769750880f72985efa71fa031b59f1349" +checksum = "a05582cdbafd1b4599d5aa871608e80f663fe8bf05e753dd8588322d0fbadc07" dependencies = [ "anyhow", "binread", diff --git a/Cargo.toml b/Cargo.toml index c3185d0..53af679 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dfir-toolkit" -version = "0.10.1" +version = "0.10.2" edition = "2021" authors = ["Jan Starke ", "Deborah Mahn "] description = "CLI tools for digital forensics and incident response" @@ -168,7 +168,7 @@ strum = { version = "0", features = ["derive"], optional=true } strum_macros = {version="0", optional=true} # nt-hive2 -nt_hive2 = {version="4.0.2", optional=true} +nt_hive2 = {version="4.1.0", optional=true} # lnk2bodyfile lnk = {version="0.5.1", optional=true} diff --git a/src/bin/cleanhive/main.rs b/src/bin/cleanhive/main.rs index 7041660..558708f 100644 --- a/src/bin/cleanhive/main.rs +++ b/src/bin/cleanhive/main.rs @@ -42,6 +42,7 @@ pub fn main() -> Result<()> { } }; + clean_hive.write_baseblock(&mut cli.dst_hive)?; std::io::copy(&mut clean_hive, &mut cli.dst_hive)?; Ok(()) }