html-to-markdown 2.23.4 → 2.24.1

data/rust-vendor/siphasher/src/lib.rs

@@ -1,10 +1,10 @@
 #![doc = include_str!("../README.md")]
-
 #![cfg_attr(not(test), no_std)]
 #![allow(clippy::unreadable_literal)]
 #![allow(clippy::cast_lossless)]
 #![allow(clippy::many_single_char_names)]
 
+mod common;
 pub mod sip;
 pub mod sip128;
 

data/rust-vendor/siphasher/src/sip.rs

@@ -15,8 +15,8 @@ use core::hash;
 use core::hash::Hasher as _;
 use core::marker::PhantomData;
 use core::mem;
-use core::ptr;
-use core::u64;
+
+use crate::common::{compress, load_int_le, u8to64_le};
 
 /// An implementation of SipHash 1-3.
 ///
@@ -77,72 +77,6 @@ struct State {
     v3: u64,
 }
 
-macro_rules! compress {
-    ($state:expr) => {{
-        compress!($state.v0, $state.v1, $state.v2, $state.v3)
-    }};
-    ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => {{
-        $v0 = $v0.wrapping_add($v1);
-        $v1 = $v1.rotate_left(13);
-        $v1 ^= $v0;
-        $v0 = $v0.rotate_left(32);
-        $v2 = $v2.wrapping_add($v3);
-        $v3 = $v3.rotate_left(16);
-        $v3 ^= $v2;
-        $v0 = $v0.wrapping_add($v3);
-        $v3 = $v3.rotate_left(21);
-        $v3 ^= $v0;
-        $v2 = $v2.wrapping_add($v1);
-        $v1 = $v1.rotate_left(17);
-        $v1 ^= $v2;
-        $v2 = $v2.rotate_left(32);
-    }};
-}
-
-/// Loads an integer of the desired type from a byte stream, in LE order. Uses
-/// `copy_nonoverlapping` to let the compiler generate the most efficient way
-/// to load it from a possibly unaligned address.
-///
-/// Unsafe because: unchecked indexing at `i..i+size_of(int_ty)`
-macro_rules! load_int_le {
-    ($buf:expr, $i:expr, $int_ty:ident) => {{
-        debug_assert!($i + mem::size_of::<$int_ty>() <= $buf.len());
-        let mut data = 0 as $int_ty;
-        ptr::copy_nonoverlapping(
-            $buf.as_ptr().add($i),
-            &mut data as *mut _ as *mut u8,
-            mem::size_of::<$int_ty>(),
-        );
-        data.to_le()
-    }};
-}
-
-/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
-/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
-/// sizes and avoid calling `memcpy`, which is good for speed.
-///
-/// Unsafe because: unchecked indexing at start..start+len
-#[inline]
-unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
-    debug_assert!(len < 8);
-    let mut i = 0; // current byte index (from LSB) in the output u64
-    let mut out = 0;
-    if i + 3 < len {
-        out = load_int_le!(buf, start + i, u32) as u64;
-        i += 4;
-    }
-    if i + 1 < len {
-        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
-        i += 2
-    }
-    if i < len {
-        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
-        i += 1;
-    }
-    debug_assert_eq!(i, len);
-    out
-}
-
 impl SipHasher {
     /// Creates a new `SipHasher` with the two initial keys set to 0.
     #[inline]

data/rust-vendor/siphasher/src/sip128.rs

@@ -15,8 +15,8 @@ use core::hash;
 use core::hash::Hasher as _;
 use core::marker::PhantomData;
 use core::mem;
-use core::ptr;
-use core::u64;
+
+use crate::common::{compress, load_int_le, u8to64_le};
 
 /// A 128-bit (2x64) hash output
 #[derive(Debug, Clone, Copy, Default)]
@@ -26,6 +26,16 @@ pub struct Hash128 {
     pub h2: u64,
 }
 
+impl PartialEq for Hash128 {
+    /// Constant-time equality comparison to prevent timing attacks.
+    fn eq(&self, other: &Self) -> bool {
+        let x = (self.h1 ^ other.h1) | (self.h2 ^ other.h2);
+        unsafe { core::ptr::read_volatile(&x) == 0 }
+    }
+}
+
+impl Eq for Hash128 {}
+
 impl From<u128> for Hash128 {
     fn from(v: u128) -> Self {
         Hash128 {
@@ -66,6 +76,7 @@ pub struct SipHasher24 {
 /// it is not intended for cryptographic purposes. As such, all
 /// cryptographic uses of this implementation are _strongly discouraged_.
 #[derive(Debug, Clone, Copy, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct SipHasher(SipHasher24);
 
 #[derive(Debug, Copy)]
@@ -93,72 +104,6 @@ struct State {
     v3: u64,
 }
 
-macro_rules! compress {
-    ($state:expr) => {{
-        compress!($state.v0, $state.v1, $state.v2, $state.v3)
-    }};
-    ($v0:expr, $v1:expr, $v2:expr, $v3:expr) => {{
-        $v0 = $v0.wrapping_add($v1);
-        $v1 = $v1.rotate_left(13);
-        $v1 ^= $v0;
-        $v0 = $v0.rotate_left(32);
-        $v2 = $v2.wrapping_add($v3);
-        $v3 = $v3.rotate_left(16);
-        $v3 ^= $v2;
-        $v0 = $v0.wrapping_add($v3);
-        $v3 = $v3.rotate_left(21);
-        $v3 ^= $v0;
-        $v2 = $v2.wrapping_add($v1);
-        $v1 = $v1.rotate_left(17);
-        $v1 ^= $v2;
-        $v2 = $v2.rotate_left(32);
-    }};
-}
-
-/// Loads an integer of the desired type from a byte stream, in LE order. Uses
-/// `copy_nonoverlapping` to let the compiler generate the most efficient way
-/// to load it from a possibly unaligned address.
-///
-/// Unsafe because: unchecked indexing at `i..i+size_of(int_ty)`
-macro_rules! load_int_le {
-    ($buf:expr, $i:expr, $int_ty:ident) => {{
-        debug_assert!($i + mem::size_of::<$int_ty>() <= $buf.len());
-        let mut data = 0 as $int_ty;
-        ptr::copy_nonoverlapping(
-            $buf.as_ptr().add($i),
-            &mut data as *mut _ as *mut u8,
-            mem::size_of::<$int_ty>(),
-        );
-        data.to_le()
-    }};
-}
-
-/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
-/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
-/// sizes and avoid calling `memcpy`, which is good for speed.
-///
-/// Unsafe because: unchecked indexing at start..start+len
-#[inline]
-unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
-    debug_assert!(len < 8);
-    let mut i = 0; // current byte index (from LSB) in the output u64
-    let mut out = 0;
-    if i + 3 < len {
-        out = load_int_le!(buf, start + i, u32) as u64;
-        i += 4;
-    }
-    if i + 1 < len {
-        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
-        i += 2
-    }
-    if i < len {
-        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
-        i += 1;
-    }
-    debug_assert_eq!(i, len);
-    out
-}
-
 pub trait Hasher128 {
     /// Return a 128-bit hash
     fn finish128(&self) -> Hash128;
@@ -669,12 +614,8 @@ impl Hash128 {
     /// Convert into a 16-bytes vector
     pub fn as_bytes(&self) -> [u8; 16] {
         let mut bytes = [0u8; 16];
-        let h1 = self.h1.to_le();
-        let h2 = self.h2.to_le();
-        unsafe {
-            ptr::copy_nonoverlapping(&h1 as *const _ as *const u8, bytes.as_mut_ptr(), 8);
-            ptr::copy_nonoverlapping(&h2 as *const _ as *const u8, bytes.as_mut_ptr().add(8), 8);
-        }
+        bytes[0..8].copy_from_slice(&self.h1.to_le_bytes());
+        bytes[8..16].copy_from_slice(&self.h2.to_le_bytes());
         bytes
     }
 

data/rust-vendor/siphasher/src/tests.rs

@@ -15,7 +15,7 @@ use super::sip::{SipHasher, SipHasher13, SipHasher24};
 // Hash just the bytes of the slice, without length prefix
 struct Bytes<'a>(&'a [u8]);
 
-impl<'a> Hash for Bytes<'a> {
+impl Hash for Bytes<'_> {
     #[allow(unused_must_use)]
     fn hash<H: Hasher>(&self, state: &mut H) {
         let Bytes(v) = *self;

data/rust-vendor/siphasher/src/tests128.rs

@@ -15,7 +15,7 @@ use super::sip128::{Hasher128, SipHasher, SipHasher13, SipHasher24};
 // Hash just the bytes of the slice, without length prefix
 struct Bytes<'a>(&'a [u8]);
 
-impl<'a> Hash for Bytes<'a> {
+impl Hash for Bytes<'_> {
     #[allow(unused_must_use)]
     fn hash<H: Hasher>(&self, state: &mut H) {
         let Bytes(v) = *self;

data/rust-vendor/uuid/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"edd951350aab4d98e5d71fb7168658c7f34e81b5ca190efbb76376c597269223","Cargo.lock":"39fc25478aa094147c2fadafaf7b90351d4ef0bcd2febe74d0d6ca0629de4ce2","Cargo.toml":"d1b1beb66bebd009aae14e0c5ae0bf2773f3261c6c539120ca99895e639a4e1e","Cargo.toml.orig":"96728886657eeeed09532cb199668259345ac815baa450aa1df9edb3ac21e539","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"6bf78646f9534efa162d26aef66f9661704428200f58779720a8475be77f0840","src/builder.rs":"8a4e3162529dd442ca9ef30fc4da809bb15053f33eb6fb8cb6e5b8e74a086a16","src/error.rs":"fc609511567b18e1396467e82fe032ab10dc33efff5fe119fe572d54df067e4a","src/external.rs":"a0640bdb98de1c24fcc9851a438a5abe6f7e3acb195885c817a64fac25521b9d","src/external/arbitrary_support.rs":"a257653e0defcd271b1b74386c2f57a398ef54c1bacf450660a2847bf7956514","src/external/borsh_support.rs":"b49d82a59653445ba26db46a1515294b1ab480c0671dbe5499dfd1fb02588b3b","src/external/serde_support.rs":"23f7a4f8168afdff38bc6feb9c29fd2e11b5d476210b41cc91a6361a8b7f2121","src/external/slog_support.rs":"d9bab6f91a80c773e77326ce40d84976beb2b2946ab708de21f25afe5b9ece13","src/fmt.rs":"ec3faa801a4e9e381f8398f2d124828d3dbc5917f7a2ed8db67a9c4f97f1a05f","src/lib.rs":"1781142268babfe41d567f8733ea176c1162848281b6dae285d0a024ce726dd0","src/macros.rs":"29524527225da1e91c5b7a753185b8b0db33b727fb5d56b21e7d9c494caa7e98","src/md5.rs":"316d65b760ffa58beb6aa678be24359eb21a744e9e143bc99c11fe1907659245","src/non_nil.rs":"093811a613ff9deba98dda73cdde3f143a6b173b9b0508f4d4372dd01656b5d4","src/parser.rs":"b9563849d23fa58829a4381fffc4a8ad03a4a83e06822c8b3052d92a14abc68d","src/rng.rs":"0025abde1ac4171b96fff8d137bb4cdc56b41387d426ab23797c30c97eb10444","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"5e18f1dad13a8f1a1503ea3247c37e5536bf9d2abafc529f45f4b3512f0457d8","src/v1.rs":"281ede6fe2b96fca062ad4dc4d150e6fd15d35c5cf98eda4daaa7be70ededd78","src/v3.rs":"3b8a0099511fb6da283174c849bd3ac54b504e1e3b7218ad5ccdd5ab388a9593","src/v4.rs":"083012653ceff1b1306998176b333863b515ebb46a22aa5c17c172462eb9bd4c","src/v5.rs":"94adabf5e1a44ecce5352e2b7b7acf8359ac40e8ba4bb904c5460bc26ad4194c","src/v6.rs":"d2866bae073946b5b5bfcd8737f1a0a7238eca5698e1e6dd333fbd8dcf6de7b7","src/v7.rs":"c57cc5d6817098397de10e890ec249a960b4fe049d42487ae1d98723332a358c","src/v8.rs":"6e847f7307c6ec78cbc6616412cc7ace914a157ac2bd7aa9caf0d629ae57d0c7"},"package":"e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"}
+{"files":{".cargo_vcs_info.json":"f17f64d5cef914410251824b85d804560f0732f13be0bf411291f28f3b50129b","Cargo.lock":"9bf297644618610aa18a5f55025ee4f14127e7eabb8d3d43260ea85667df3f93","Cargo.toml":"051b4e7450cba140b25a5b2e222a3410233b9c9c51096f3ef12f04b0d2f196b9","Cargo.toml.orig":"69d6272b547f77f91cf5b46c864b0e1f17fbfd75be837947a64426af4e17691f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"436bc5a105d8e57dcd8778730f3754f7bf39c14d2f530e4cde4bd2d17a83ec3d","README.md":"080e8074a56fe10f70b134e32f7afd4d072e1f5e10cc5a28a5ac9a31ff0ac21a","src/builder.rs":"d332dbf9380bd6275f8c416758a8971db875ce2a661440c8e476cc6f827736c9","src/error.rs":"fc609511567b18e1396467e82fe032ab10dc33efff5fe119fe572d54df067e4a","src/external.rs":"a0640bdb98de1c24fcc9851a438a5abe6f7e3acb195885c817a64fac25521b9d","src/external/arbitrary_support.rs":"a257653e0defcd271b1b74386c2f57a398ef54c1bacf450660a2847bf7956514","src/external/borsh_support.rs":"b49d82a59653445ba26db46a1515294b1ab480c0671dbe5499dfd1fb02588b3b","src/external/serde_support.rs":"0d64ceb2fde5494635d7bcab47d8cceb2b31a3bd3909fcbefff8ca43fb5b5351","src/external/slog_support.rs":"d9bab6f91a80c773e77326ce40d84976beb2b2946ab708de21f25afe5b9ece13","src/fmt.rs":"ec3faa801a4e9e381f8398f2d124828d3dbc5917f7a2ed8db67a9c4f97f1a05f","src/lib.rs":"86128cddddee663147874581cdb8c98c662d642eee5de52e94a40d32c199a46c","src/macros.rs":"76b6c6da92909ba9da6d3ed41c818943825939c9ed6bca7be81acec737abfcb5","src/md5.rs":"316d65b760ffa58beb6aa678be24359eb21a744e9e143bc99c11fe1907659245","src/non_nil.rs":"4703e3a839c520f19d98c0b8c891114c07b18e7c5971bc17449eb1d14f0e171c","src/parser.rs":"b9563849d23fa58829a4381fffc4a8ad03a4a83e06822c8b3052d92a14abc68d","src/rng.rs":"0025abde1ac4171b96fff8d137bb4cdc56b41387d426ab23797c30c97eb10444","src/sha1.rs":"e1a9657e11f1ed1ede33c0655f9c2641059b7c24f17be4ac425c930cc216e019","src/timestamp.rs":"5e18f1dad13a8f1a1503ea3247c37e5536bf9d2abafc529f45f4b3512f0457d8","src/v1.rs":"281ede6fe2b96fca062ad4dc4d150e6fd15d35c5cf98eda4daaa7be70ededd78","src/v3.rs":"3b8a0099511fb6da283174c849bd3ac54b504e1e3b7218ad5ccdd5ab388a9593","src/v4.rs":"083012653ceff1b1306998176b333863b515ebb46a22aa5c17c172462eb9bd4c","src/v5.rs":"94adabf5e1a44ecce5352e2b7b7acf8359ac40e8ba4bb904c5460bc26ad4194c","src/v6.rs":"d2866bae073946b5b5bfcd8737f1a0a7238eca5698e1e6dd333fbd8dcf6de7b7","src/v7.rs":"c57cc5d6817098397de10e890ec249a960b4fe049d42487ae1d98723332a358c","src/v8.rs":"6e847f7307c6ec78cbc6616412cc7ace914a157ac2bd7aa9caf0d629ae57d0c7"},"package":"ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"}

data/rust-vendor/uuid/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "7527cef15f39fe493a92bda19d28eebec2c73ebf"
+    "sha1": "c3346ddf2a78ecadefbadaa83d22e263342745ca"
   },
   "path_in_vcs": ""
 }