Merge pull request #849 from sfackler/md-updates

Update hash crates

Author: sfackler

postgres-protocol/Cargo.toml

@@ -13,9 +13,9 @@ base64 = "0.13"
 byteorder = "1.0"
 bytes = "1.0"
 fallible-iterator = "0.2"
-hmac = "0.11"
-md-5 = "0.9"
+hmac = "0.12"
+md-5 = "0.10"
 memchr = "2.0"
 rand = "0.8"
-sha2 = "0.9"
+sha2 = "0.10"
 stringprep = "0.1"

postgres-protocol/src/authentication/sasl.rs

@@ -1,6 +1,6 @@
 //! SASL-based authentication support.
 
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use rand::{self, Rng};
 use sha2::digest::FixedOutput;
 use sha2::{Digest, Sha256};
@@ -275,7 +275,7 @@ impl ScramSha256 {
         let mut hmac = Hmac::<Sha256>::new_from_slice(&server_key)
             .expect("HMAC is able to accept all key sizes");
         hmac.update(auth_message.as_bytes());
-        hmac.verify(&verifier)
+        hmac.verify_slice(&verifier)
             .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "SCRAM verification error"))
     }
 }

postgres-protocol/src/password/mod.rs

@@ -7,7 +7,7 @@
 //! end up in logs pg_stat displays, etc.
 
 use crate::authentication::sasl;
-use hmac::{Hmac, Mac, NewMac};
+use hmac::{Hmac, Mac};
 use md5::Md5;
 use rand::RngCore;
 use sha2::digest::FixedOutput;

tokio-postgres/src/config.rs

@@ -780,7 +780,7 @@ impl<'a> UrlParser<'a> {
     }
 
     fn take_all(&mut self) -> &'a str {
-        mem::replace(&mut self.s, "")
+        mem::take(&mut self.s)
     }
 
     fn eat_byte(&mut self) {