From 72f8ef65ced241c214812f4a5d8a8cb34268e59e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 13 Mar 2021 09:33:06 +0100
Subject: 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>
---
 Cargo.toml            | 2 +-
 src/package/source.rs | 9 +++++++--
 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 {
-- 
cgit v1.2.3


From 908a433889bec3b29301ec0c2dd39d8bd4a2ae68 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <matthias.beyer@atos.net>
Date: Tue, 16 Mar 2021 16:33:09 +0100
Subject: Update dialoguer: 0.7 -> 0.8

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4973631..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"
-- 
cgit v1.2.3