summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2021-03-17 07:03:49 +0100
committerMatthias Beyer <mail@beyermatthias.de>2021-03-17 07:03:49 +0100
commita79909fe8c4967a3f3fce6b8761b4f1c29d34f47 (patch)
tree4d5d8616da43aaa09d29f9e7eed11c294ce0da5d
parentf8b2580037a8661c1b2fbc54f0476f7c751600b4 (diff)
parent908a433889bec3b29301ec0c2dd39d8bd4a2ae68 (diff)
Merge branch 'update-deps'
-rw-r--r--Cargo.toml4
-rw-r--r--src/package/source.rs9
2 files changed, 9 insertions, 4 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 0f36ca3..5563183 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ colored = "2"
config = { git = "https://github.com/matthiasbeyer/config-rs", branch = "add-setter" }
csv = "1.1"
daggy = { version = "0.7", features = [ "serde" ] }
-dialoguer = "0.7"
+dialoguer = "0.8"
diesel = { version = "1.4", features = ["postgres", "chrono", "uuid", "serde_json"] }
env_logger = "0.8"
filters = "0.4.0"
@@ -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 {