bump reqwest version to 0.10.1

olpc-cjson/src/lib.rs

@@ -32,6 +32,7 @@
 
 #![deny(rust_2018_idioms)]
 #![warn(clippy::pedantic)]
+#![allow(clippy::must_use_candidate)]
 
 use serde::Serialize;
 use serde_json::ser::{CharEscape, CompactFormatter, Formatter, Serializer};

tough/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+- Updated `reqwest` to `0.10.1` to fix an issue with https failures. Note this requires use of `reqwest::blocking::*` instead of `reqwest::*` in code that is using HttpTransport.
+
 ## [0.3.0] - 2019-12-16
 ### Added
 - Added the `Sign` trait to `tough`, which allows users to sign data.
@@ -24,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Everything!
 
+[Unreleased]: https://github.com/awslabs/tough/compare/tuftool-v0.3.0...HEAD
 [0.3.0]: https://github.com/awslabs/tough/compare/tough-v0.2.0...tough-v0.3.0
 [0.2.0]: https://github.com/awslabs/tough/compare/tough-v0.1.0...tough-v0.2.0
 [0.1.0]: https://github.com/awslabs/tough/releases/tag/tough-v0.1.0

tough/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tough"
-version = "0.3.0"
+version = "0.4.0"
 description = "The Update Framework (TUF) repository client"
 authors = ["iliana destroyer of worlds <iweller@amazon.com>"]
 license = "MIT OR Apache-2.0"
@@ -13,7 +13,7 @@ chrono = { version = "0.4.6", features = ["serde"] }
 hex = "0.4.0"
 olpc-cjson = { version = "0.1.0", path = "../olpc-cjson" }
 pem = "0.7.0"
-reqwest = { version = "0.9.17", optional = true, default-features = false }
+reqwest = { version = "0.10.1", optional = true, default-features = false, features = ["blocking"] }
 ring = { version = "0.16.7", features = ["std"] }
 serde = { version = "1.0.92", features = ["derive"] }
 serde_json = "1.0.39"

tough/src/lib.rs

@@ -15,6 +15,7 @@
 #![deny(rust_2018_idioms)]
 #![warn(clippy::pedantic)]
 #![allow(clippy::module_name_repetitions)]
+#![allow(clippy::must_use_candidate)]
 
 mod datastore;
 pub mod error;

tough/src/transport.rs

@@ -30,11 +30,11 @@ impl Transport for FilesystemTransport {
 }
 
 #[cfg(feature = "http")]
-pub type HttpTransport = reqwest::Client;
+pub type HttpTransport = reqwest::blocking::Client;
 
 #[cfg(feature = "http")]
-impl Transport for reqwest::Client {
-    type Stream = reqwest::Response;
+impl Transport for reqwest::blocking::Client {
+    type Stream = reqwest::blocking::Response;
     type Error = reqwest::Error;
 
     fn fetch(&self, url: Url) -> Result<Self::Stream, Self::Error> {

tuftool/Cargo.toml

@@ -21,7 +21,7 @@ maplit = "1.0.1"
 olpc-cjson = { version = "0.1.0", path = "../olpc-cjson" }
 pem = "0.7.0"
 rayon = "1.2"
-reqwest = "0.9.20"
+reqwest = { version = "0.10.1", features = ["blocking"] }
 ring = { version = "0.16.7", features = ["std"] }
 rusoto_core = { version = "0.42", optional = true, default-features = false }
 rusoto_credential = { version = "0.42", optional = true }
@@ -33,7 +33,7 @@ structopt = "0.3"
 tempfile = "3.1.0"
 url = "2.1.0"
 walkdir = "2.2.9"
-tough = { version = "0.3.0", path = "../tough", features = ["http"] }
+tough = { version = "0.4.0", path = "../tough", features = ["http"] }
 
 [dev-dependencies]
 assert_cmd = "0.12"

tuftool/src/download.rs

@@ -78,7 +78,7 @@ impl DownloadArgs {
                 .create(true)
                 .open(&path)
                 .context(error::OpenFile { path: &path })?;
-            reqwest::get(url.as_str())
+            reqwest::blocking::get(url.as_str())
                 .context(error::ReqwestGet)?
                 .copy_to(&mut f)
                 .context(error::ReqwestCopy)?;