leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preparing for v7.0.0 release

Browse source
This commit is contained in:
Igor Katson 2024-08-27 17:26:39 +01:00
parent b99aab850c
commit a825115472
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
9 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/bencode/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "librqbit-bencode"
version = "3.0.0"
version = "3.0.1"
edition = "2021"
description = "Bencode serialization and deserialization using Serde"
license = "Apache-2.0"
@ -19,5 +19,5 @@ serde = { version = "1", features = ["derive"] }
buffers = { path = "../buffers", package = "librqbit-buffers", version = "4" }
clone_to_owned = { path = "../clone_to_owned", package = "librqbit-clone-to-owned", version = "3" }
anyhow = "1"
sha1w = { path = "../sha1w", default-features = false, package = "librqbit-sha1-wrapper", version = "3.0.0" }
sha1w = { path = "../sha1w", default-features = false, package = "librqbit-sha1-wrapper", version = "4" }
bytes = "1.7.1"

22
crates/bencode/src/serde_bencode_de.rs
View file

@ -1,6 +1,5 @@
use buffers::ByteBuf;
use serde::de::Error as DeError;
use sha1w::{ISha1, Sha1};
pub struct BencodeDeserializer<'de> {
buf: &'de [u8],
@ -539,16 +538,21 @@ impl<'a, 'de> serde::de::MapAccess<'de> for MapAccess<'a, 'de> {
where
V: serde::de::DeserializeSeed<'de>,
{
#[cfg(any(feature = "sha1-crypto-hash", feature = "sha1-ring"))]
let buf_before = self.de.buf;
let value = seed.deserialize(&mut *self.de)?;
if self.de.is_torrent_info && self.de.field_context.as_slice() == [ByteBuf(b"info")] {
let len = self.de.buf.as_ptr() as usize - buf_before.as_ptr() as usize;
let mut hash = Sha1::new();
let torrent_info_bytes = &buf_before[..len];
hash.update(torrent_info_bytes);
let digest = hash.finish();
self.de.torrent_info_digest = Some(digest);
self.de.torrent_info_bytes = Some(torrent_info_bytes);
#[cfg(any(feature = "sha1-crypto-hash", feature = "sha1-ring"))]
{
use sha1w::{ISha1, Sha1};
if self.de.is_torrent_info && self.de.field_context.as_slice() == [ByteBuf(b"info")] {
let len = self.de.buf.as_ptr() as usize - buf_before.as_ptr() as usize;
let mut hash = Sha1::new();
let torrent_info_bytes = &buf_before[..len];
hash.update(torrent_info_bytes);
let digest = hash.finish();
self.de.torrent_info_digest = Some(digest);
self.de.torrent_info_bytes = Some(torrent_info_bytes);
}
}
self.de.field_context.pop();
Ok(value)