From ebfc20c291e04745746b782f1fafccd6367aa9b8 Mon Sep 17 00:00:00 2001 From: Igor Katson Date: Sun, 17 Oct 2021 12:03:21 +0100 Subject: [PATCH] Changed default sha1 to crypto_hash. Hopefully it'll be easier to build now. The downside is that it allocates a small vec on each finish, but it's much faster than rust-sha1 anyway, at least on ARM (where I'm running rqbit myself). --- crates/bencode/Cargo.toml | 2 +- crates/librqbit/Cargo.toml | 2 +- crates/rqbit/Cargo.toml | 2 +- crates/sha1w/Cargo.toml | 2 +- crates/sha1w/src/lib.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/bencode/Cargo.toml b/crates/bencode/Cargo.toml index d4b48b4..84c0404 100644 --- a/crates/bencode/Cargo.toml +++ b/crates/bencode/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = ["sha1-openssl"] +default = ["sha1-system"] sha1-system = ["sha1w/sha1-system"] sha1-openssl = ["sha1w/sha1-openssl"] sha1-rust = ["sha1w/sha1-openssl"] diff --git a/crates/librqbit/Cargo.toml b/crates/librqbit/Cargo.toml index 1bb1c58..01c9675 100644 --- a/crates/librqbit/Cargo.toml +++ b/crates/librqbit/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Igor Katson "] edition = "2018" [features] -default = ["sha1-openssl"] +default = ["sha1-system"] sha1-system = ["sha1w/sha1-system"] sha1-openssl = ["sha1w/sha1-openssl"] sha1-rust = ["sha1w/sha1-openssl"] diff --git a/crates/rqbit/Cargo.toml b/crates/rqbit/Cargo.toml index c223b54..963d90a 100644 --- a/crates/rqbit/Cargo.toml +++ b/crates/rqbit/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Igor Katson "] edition = "2018" [features] -default = ["sha1-openssl"] +default = ["sha1-system"] sha1-system = ["librqbit/sha1-system"] sha1-openssl = ["librqbit/sha1-openssl"] sha1-rust = ["librqbit/sha1-rust"] diff --git a/crates/sha1w/Cargo.toml b/crates/sha1w/Cargo.toml index 110fb08..2c39334 100644 --- a/crates/sha1w/Cargo.toml +++ b/crates/sha1w/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] -default = ["sha1-openssl"] +default = ["sha1-system"] sha1-system = ["crypto-hash"] sha1-openssl = ["openssl"] sha1-rust = ["sha1"] diff --git a/crates/sha1w/src/lib.rs b/crates/sha1w/src/lib.rs index 244fb0f..a4f0007 100644 --- a/crates/sha1w/src/lib.rs +++ b/crates/sha1w/src/lib.rs @@ -83,7 +83,7 @@ impl ISha1 for Sha1System { fn finish(mut self) -> [u8; 20] { let result = self.inner.finish(); - assert_eq!(result.len(), 20); + debug_assert_eq!(result.len(), 20); let mut result_arr = [0u8; 20]; result_arr.copy_from_slice(&result); result_arr