From d5af1733c5d335c7cb3a081433203fc3535a6bf8 Mon Sep 17 00:00:00 2001 From: Yannick Poirier Date: Fri, 12 Sep 2025 08:25:36 +0200 Subject: [PATCH] Update md5 crate --- Cargo.toml | 2 +- src/receiver/blockwriter.rs | 9 +++++++-- src/sender/objectdesc.rs | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8c9a9de..c899157 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ url = "2.5" num-integer = "0.1" reed-solomon-erasure = "6.0" flate2 = "1.0" -md5 = "0.7" +md5 = "0.8" pyo3 = { version = "0.25", features = ["extension-module"], optional = true } pyo3-log = { version = "0.12", optional = true } raptorq = "2.0" diff --git a/src/receiver/blockwriter.rs b/src/receiver/blockwriter.rs index efea57a..6821d80 100644 --- a/src/receiver/blockwriter.rs +++ b/src/receiver/blockwriter.rs @@ -105,7 +105,7 @@ impl BlockWriter { self.decoder_read(writer, now)?; } - let output = self.md5_context.take().map(|ctx| ctx.compute().0); + let output = self.md5_context.take().map(|ctx| ctx.finalize().0); self.md5 = output.map(|output| base64::engine::general_purpose::STANDARD.encode(output)); } @@ -124,7 +124,12 @@ impl BlockWriter { self.buffer.resize(data.len(), 0); } - fn write_pkt_cenc_null(&mut self, data: &[u8], writer: &dyn ObjectWriter, now: SystemTime) -> Result<()> { + fn write_pkt_cenc_null( + &mut self, + data: &[u8], + writer: &dyn ObjectWriter, + now: SystemTime, + ) -> Result<()> { if let Some(ctx) = self.md5_context.as_mut() { ctx.consume(data) } diff --git a/src/sender/objectdesc.rs b/src/sender/objectdesc.rs index 2d61730..4cf5b19 100644 --- a/src/sender/objectdesc.rs +++ b/src/sender/objectdesc.rs @@ -104,7 +104,7 @@ impl dyn ObjectDataStreamTrait + '_ { } reader.seek(std::io::SeekFrom::Start(0))?; - Ok(context.compute()) + Ok(context.finalize()) } }