summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2021-03-13 09:33:06 +0100
committerMatthias Beyer <matthias.beyer@atos.net>2021-03-13 09:36:09 +0100
commit72f8ef65ced241c214812f4a5d8a8cb34268e59e (patch)
treec12f0ddcbec0135fa1456469d156b4c3aa2f5f5a
parent040b19ea29212375d5cb308791bacd77f27ab3b9 (diff)
Switch from sha1 to sha-1
This is because the "sha1" crate seems to be unmaintained (no release in 3 years) but the sha-1 crate seems to be actively maintained in the context of a bigger rust-crypto-functions project. Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Tested-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--Cargo.toml2
-rw-r--r--src/package/source.rs9
2 files changed, 8 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 0f36ca3..4973631 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ result-inspect = "0.2"
semver = { version = "0.11", features = [ "serde" ] }
serde = "1"
serde_json = "1"
-sha1 = { version = "0.6", features = ["std"] }
+sha-1 = "0.9"
sha2 = "0.9"
shiplift = "0.7"
syntect = "4.4"
diff --git a/src/package/source.rs b/src/package/source.rs
index 5fadc99..a9ee083 100644
--- a/src/package/source.rs
+++ b/src/package/source.rs
@@ -16,7 +16,6 @@ use log::trace;
use serde::Deserialize;
use serde::Serialize;
use url::Url;
-use sha2::Digest;
#[derive(Clone, Debug, Serialize, Deserialize, Getters)]
pub struct Source {
@@ -101,6 +100,8 @@ impl HashType {
match self {
HashType::Sha1 => {
+ use sha1::Digest;
+
trace!("SHA1 hashing buffer");
let mut m = sha1::Sha1::new();
loop {
@@ -118,9 +119,11 @@ impl HashType {
trace!("Updating buffer");
m.update(&buffer[..count]);
}
- Ok(HashValue(m.digest().to_string()))
+ Ok(HashValue(format!("{:x}", m.finalize())))
}
HashType::Sha256 => {
+ use sha2::Digest;
+
trace!("SHA256 hashing buffer");
let mut m = sha2::Sha256::new();
loop {
@@ -143,6 +146,8 @@ impl HashType {
Ok(HashValue(h))
}
HashType::Sha512 => {
+ use sha2::Digest;
+
trace!("SHA512 hashing buffer");
let mut m = sha2::Sha512::new();
loop {