Merge latest master into branch

Author: colingm

.circleci/config.yml

@@ -22,7 +22,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.39.0
+      - image: rust:1.40.0
         environment:
           RUSTFLAGS: -D warnings
       - image: sfackler/rust-postgres-test:6

postgres-derive/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
-## v0.1.0-alpha.1 - 2019-10-14
+## v0.4.0 - 2019-12-23
+
+No changes
+
+## v0.4.0-alpha.1 - 2019-10-14
 
 * Initial release

postgres-derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-derive"
-version = "0.4.0-alpha.1"
+version = "0.4.0"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT/Apache-2.0"
 edition = "2018"

postgres-native-tls/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.3.0 - 2019-12-23
+
+### Changed
+
+* Upgraded to `tokio-postgres` 0.5.
+
 ## v0.3.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-native-tls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-native-tls"
-version = "0.3.0-alpha.2"
+version = "0.3.0"
 authors = ["Steven Fackler <[email protected]>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -21,8 +21,8 @@ futures = "0.3"
 native-tls = "0.2"
 tokio = "0.2"
 tokio-tls = "0.3"
-tokio-postgres = { version = "=0.5.0-alpha.2", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.5.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["full"] }
-postgres = { version = "=0.17.0-alpha.2", path = "../postgres" }
+postgres = { version = "0.17.0", path = "../postgres" }

postgres-openssl/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.3.0 - 2019-12-23
+
+### Changed
+
+* Upgraded to `tokio-postgres` 0.5.
+
 ## v0.3.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-openssl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "postgres-openssl"
-version = "0.3.0-alpha.2"
+version = "0.3.0"
 authors = ["Steven Fackler <[email protected]>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -21,8 +21,8 @@ futures = "0.3"
 openssl = "0.10"
 tokio = "0.2"
 tokio-openssl = "0.4"
-tokio-postgres = { version = "=0.5.0-alpha.2", path = "../tokio-postgres", default-features = false }
+tokio-postgres = { version = "0.5.0", path = "../tokio-postgres", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "0.2", features = ["full"] }
-postgres = { version = "=0.17.0-alpha.2", path = "../postgres" }
+postgres = { version = "0.17.0", path = "../postgres" }

postgres-protocol/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## v0.5.0 - 2019-12-23
+
+### Changed
+
+* `frontend::Message` is now a true non-exhaustive enum.
+
 ## v0.5.0-alpha.2 - 2019-11-27
 
 ### Changed

postgres-protocol/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
 name = "postgres-protocol"
-version = "0.5.0-alpha.2"
+version = "0.5.0"
 authors = ["Steven Fackler <[email protected]>"]
 edition = "2018"
 description = "Low level Postgres protocol APIs"
 license = "MIT/Apache-2.0"
-repository = "https://github.com/sfackler/rust-postgres-protocol"
+repository = "https://github.com/sfackler/rust-postgres"
 readme = "../README.md"
 
 [dependencies]
-base64 = "0.10"
+base64 = "0.11"
 byteorder = "1.0"
 bytes = "0.5"
 fallible-iterator = "0.2"
-generic-array = "0.13"
 hmac = "0.7"
-md5 = "0.6"
+md5 = "0.7"
 memchr = "2.0"
 rand = "0.7"
 sha2 = "0.8"

postgres-protocol/src/authentication/sasl.rs

@@ -1,7 +1,5 @@
 //! SASL-based authentication support.
 
-use generic_array::typenum::U32;
-use generic_array::GenericArray;
 use hmac::{Hmac, Mac};
 use rand::{self, Rng};
 use sha2::{Digest, Sha256};
@@ -33,13 +31,13 @@ fn normalize(pass: &[u8]) -> Vec<u8> {
     }
 }
 
-fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
+fn hi(str: &[u8], salt: &[u8], i: u32) -> [u8; 32] {
     let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("HMAC is able to accept all key sizes");
     hmac.input(salt);
     hmac.input(&[0, 0, 0, 1]);
     let mut prev = hmac.result().code();
 
-    let mut hi = GenericArray::<u8, U32>::clone_from_slice(&prev);
+    let mut hi = prev;
 
     for _ in 1..i {
         let mut hmac = Hmac::<Sha256>::new_varkey(str).expect("already checked above");
@@ -51,7 +49,7 @@ fn hi(str: &[u8], salt: &[u8], i: u32) -> GenericArray<u8, U32> {
         }
     }
 
-    hi
+    hi.into()
 }
 
 enum ChannelBindingInner {
@@ -103,7 +101,7 @@ enum State {
         channel_binding: ChannelBinding,
     },
     Finish {
-        salted_password: GenericArray<u8, U32>,
+        salted_password: [u8; 32],
         auth_message: String,
     },
     Done,
@@ -220,7 +218,7 @@ impl ScramSha256 {
         hmac.input(auth_message.as_bytes());
         let client_signature = hmac.result();
 
-        let mut client_proof = GenericArray::<u8, U32>::clone_from_slice(&client_key);
+        let mut client_proof = client_key;
         for (proof, signature) in client_proof.iter_mut().zip(client_signature.code()) {
             *proof ^= signature;
         }