Bump hmac, sha-1 and sha2 (#1117)

The crypto crates are interdependent so bump them in one go.

It looks like `new_varkey()` was renamed to `new_from_slice()`, at least
that is what I gather from the changed example in the documentation of
the hmac crate between version 0.11 and 0.10.
See https://docs.rs/hmac/0.11.0/hmac/index.html

The changelog doesn't mention anything of the sort.

Also I'm not sure if the S3 version even works anymore, since I think
AWS requires the v4 authentication scheme now and not the older v2 version
used in simples3. It would probably make sense to use the new aws-sdk or
one of its subcrates.

Signed-off-by: Jonathan Schwender <[email protected]>

Author: jschwe

Cargo.lock

@@ -40,7 +40,7 @@ filetime = "0.2"
 flate2 = { version = "1.0", optional = true, default-features = false, features = ["rust_backend"] }
 futures = "0.3"
 futures-locks = "0.6"
-hmac = { version = "0.10", optional = true }
+hmac = { version = "0.12.0", optional = true }
 http = "0.2"
 hyper = { version = "0.14", optional = true, features = ["server"] }
 hyperx = { version = "1.0", optional = true }
@@ -63,8 +63,8 @@ regex = "1"
 reqwest = { version = "0.11", features = ["json", "blocking"], optional = true }
 retry = "1"
 ring = { version = "0.16", optional = true, features = ["std"] }
-sha-1 = { version = "0.9", optional = true }
-sha2 = { version = "0.9", optional = true }
+sha-1 = { version = "0.10.0", optional = true }
+sha2 = { version = "0.10.1", optional = true }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use crate::azure::credentials::*;
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use hyperx::header;
 use md5::{Digest, Md5};
 use reqwest::Url;
@@ -29,7 +29,7 @@ use crate::util::HeadersExt;
 const BLOB_API_VERSION: &str = "2017-04-17";
 
 fn hmac(data: &[u8], secret: &[u8]) -> Vec<u8> {
-    let mut hmac = Hmac::<Sha256>::new_varkey(secret).expect("HMAC can take key of any size");
+    let mut hmac = Hmac::<Sha256>::new_from_slice(secret).expect("HMAC can take key of any size");
     hmac.update(data);
     hmac.finalize().into_bytes().as_slice().to_vec()
 }

src/azure/blobstore.rs

@@ -6,7 +6,7 @@ use std::ascii::AsciiExt;
 use std::fmt;
 
 use crate::simples3::credential::*;
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use hyper::header::HeaderValue;
 use hyper::Method;
 use hyperx::header;
@@ -38,7 +38,7 @@ fn base_url(endpoint: &str, ssl: Ssl) -> String {
 }
 
 fn hmac(key: &[u8], data: &[u8]) -> Vec<u8> {
-    let mut hmac = Hmac::<Sha1>::new_varkey(key).expect("HMAC can take key of any size");
+    let mut hmac = Hmac::<Sha1>::new_from_slice(key).expect("HMAC can take key of any size");
     hmac.update(data);
     hmac.finalize().into_bytes().as_slice().to_vec()
 }