Merge pull request #1961 from input-output-hk/rustls-switch

switch to rustls from openssl

Author: NicolasDP

Cargo.lock

@@ -39,7 +39,6 @@ rustc --version # if this fails, try a new command window, or add the path (see
   * Homebrew on macOS.
   * `vcpkg` on Windows.
   * `pkg-config` on other Unix-like systems.
-* OpenSSL with header files.
 * C compiler (see [cc-rs](https://github.com/alexcrichton/cc-rs) for more details):
   * Must be available as `cc` on Unix and MinGW.
   * Or as `cl.exe` on Windows.

README.md

@@ -35,7 +35,7 @@ RUN if [ "${ENV_BUILD}" = "false" ]; then \
 # install the node and jcli from source
 RUN if [ "${ENV_BUILD}" = "true" ]; then \
     echo "[INFO] - you have selected to build and install from source" && \
-    apt-get install -y build-essential pkg-config libssl-dev && \
+    apt-get install -y build-essential pkg-config && \
     bash -c "curl https://sh.rustup.rs -sSf | bash -s -- -y" && \
     export PATH=$HOME/.cargo/bin:$PATH && \
     rustup install stable && \
@@ -51,8 +51,8 @@ RUN if [ "${ENV_BUILD}" = "true" ]; then \
 # cleanup
 RUN rm -rf ${ENV_PREFIX}/src && \
     RM_ME=`apt-mark showauto` && \
-    apt-get remove --purge --auto-remove -y git curl build-essential pkg-config libssl-dev ${RM_ME} && \
-    apt-get install -y --no-install-recommends libssl1.1 && \
+    apt-get remove --purge --auto-remove -y git curl build-essential pkg-config ${RM_ME} && \
+    apt-get install -y --no-install-recommends && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

docker/Dockerfile

@@ -29,7 +29,6 @@ chain-impl-mockchain = { path = "../chain-deps/chain-impl-mockchain" }
 chain-addr      = { path = "../chain-deps/chain-addr" }
 chain-crypto    = { path = "../chain-deps/chain-crypto" }
 chain-time    = { path = "../chain-deps/chain-time" }
-reqwest = "0.9.11"
 jormungandr-lib = { path = "../jormungandr-lib" }
 gtmpl = "0.5.6"
 openapiv3 = "0.3.0"
@@ -42,6 +41,11 @@ version = "2.32"
 default-features = false
 features = [ "suggestions", "color", "wrap_help" ]
 
+[dependencies.reqwest]
+version = "0.9"
+features = ["rustls-tls"]
+default-features = false
+
 [dev-dependencies]
 maplit = "1.0.2"
 mktemp = "0.4.0"

jcli/Cargo.toml

@@ -39,7 +39,11 @@ jormungandr = { path = "../jormungandr" }
 jcli = { path = "../jcli" }
 poldercast = "0.11.4"
 thiserror = "1.0"
-reqwest = "0.9.24"
+
+[dependencies.reqwest]
+version = "0.9"
+features = ["rustls-tls"]
+default-features = false
 
 [dev-dependencies]
 chain-core           = { path = "../chain-deps/chain-core", features=["property-test-api"]}

jormungandr-integration-tests/Cargo.toml

@@ -12,7 +12,6 @@ bawawa = "0.1.5"
 bytes = "0.4"
 error-chain = "0.12"
 tokio = "0.1"
-reqwest = "0.9"
 mktemp = "0.4.0"
 chain-core           = { path = "../chain-deps/chain-core", features = [ "property-test-api" ] }
 chain-crypto         = { path = "../chain-deps/chain-crypto", features = [ "property-test-api" ] }
@@ -35,3 +34,8 @@ hex = "0.4"
 console = "0.10"
 indicatif = "0.14"
 lazy_static = "1"
+
+[dependencies.reqwest]
+version = "0.9"
+features = ["rustls-tls"]
+default-features = false

jormungandr-scenario-tests/Cargo.toml

@@ -64,9 +64,13 @@ tokio02 = { package = "tokio", version = "0.2.12", features = ["full"]}
 tokio-threadpool = "0.1"
 bech32 = "0.7"
 async-trait = "0.1"
-reqwest = "0.10"
 lru = "^0.4.3"
 
+[dependencies.reqwest]
+version = "0.10"
+features = ["rustls-tls"]
+default-features = false
+
 [dev-dependencies]
 chain-core           = { path = "../chain-deps/chain-core", features=["property-test-api"]}
 chain-crypto         = { path = "../chain-deps/chain-crypto", features=["property-test-api"] }