diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d8ffa5dd..3a5351d9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Removed OpenSSL from all images.
+
 ## [v0.1.16] - 2019-09-17
 
 - Bump OpenSSL version to 1.0.2t.
diff --git a/README.md b/README.md
index e94efc3dd..4a74e9206 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ This project is developed and maintained by the [Tools team][team].
 - `cross` will provide all the ingredients needed for cross compilation without
   touching your system installation.
 
-- `cross` provides an environment, cross toolchain and cross compiled libraries
-  (e.g. OpenSSL), that produces the most portable binaries.
+- `cross` provides an environment, cross toolchain and cross compiled libraries,
+  that produces the most portable binaries.
 
 - “cross testing”, `cross` can test crates for architectures other than i686 and
   x86_64.
@@ -188,50 +188,50 @@ QEMU gets upset when you spawn multiple threads. This means that, if one of your
 unit tests spawns threads, then it's more likely to fail or, worst, never
 terminate.
 
-| Target                               |  libc  |   GCC   | OpenSSL | C++ | QEMU  | `test` |
-|--------------------------------------|-------:|--------:|--------:|:---:|------:|:------:|
-| `*-apple-ios` [1]                    | N/A    | N/A     | N/A     | N/A | N/A   |   ✓    |
-| `aarch64-linux-android` [2]          | N/A    | 4.9     | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `aarch64-unknown-linux-gnu`          | 2.19   | 4.8.2   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `aarch64-unknown-linux-musl`         | 1.1.20 | 6.3.0   | 1.0.2p  |     | 2.8.0 |   ✓    |
-| `arm-linux-androideabi` [2]          | N/A    | 4.9     | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `arm-unknown-linux-gnueabi`          | 2.19   | 4.8.2   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `arm-unknown-linux-gnueabihf`        | 2.27   | 7.3.0   | 1.0.2p  | ✓   | 2.10  |   ✓    |
-| `arm-unknown-linux-musleabi`         | 1.1.20 | 6.3.0   | 1.0.2p  |     | 2.8.0 |   ✓    |
-| `arm-unknown-linux-musleabihf`       | 1.1.20 | 6.3.0   | 1.0.2p  |     | 2.8.0 |   ✓    |
-| `armv5te-unknown-linux-musleabi`     | 1.1.20 | 6.3.0   |  N/A    |     | 2.8.0 |   ✓    |
-| `armv7-linux-androideabi` [2]        | N/A    | 4.9     | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `armv7-unknown-linux-gnueabihf`      | 2.15   | 4.6.2   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `armv7-unknown-linux-musleabihf`     | 1.1.20 | 6.3.0   | 1.0.2p  |     | 2.8.0 |   ✓    |
-| `i586-unknown-linux-gnu`             | 2.23   | 5.3.1   | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `i586-unknown-linux-musl`            | 1.1.20 | 6.3.0   | 1.0.2p  |     | N/A   |   ✓    |
-| `i686-linux-android` [2]             | N/A    | 4.9     | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `i686-unknown-linux-gnu`             | 2.15   | 4.6.2   | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `i686-unknown-linux-musl`            | 1.1.20 | 6.3.0   | 1.0.2p  |     | N/A   |   ✓    |
-| `mips-unknown-linux-gnu`             | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `mips-unknown-linux-musl`            | 1.1.20 | 6.3.0   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `mips64-unknown-linux-gnuabi64`      | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `mips64el-unknown-linux-gnuabi64`    | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `mipsel-unknown-linux-gnu`           | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `mipsel-unknown-linux-musl`          | 1.1.20 | 6.3.0   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `powerpc-unknown-linux-gnu`          | 2.19   | 4.8.2   | 1.0.2p  | ✓   | 2.7.1 |   ✓    |
-| `powerpc64-unknown-linux-gnu`        | 2.19   | 4.8.2   | 1.0.2p  | ✓   | 2.7.1 |   ✓    |
-| `powerpc64le-unknown-linux-gnu`      | 2.19   | 4.8.2   | 1.0.2p  | ✓   | 2.7.1 |   ✓    |
-| `s390x-unknown-linux-gnu`            | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |        |
-| `sparc64-unknown-linux-gnu` [3]      | 2.23   | 5.3.1   | 1.0.2p  | ✓   | 2.8.0 |   ✓    |
-| `sparcv9-sun-solaris` [4]            | 2.11   | 5.3.0   | 1.0.2p  | ✓   | N/A   |        |
-| `thumbv6m-none-eabi` [5]             | 2.2.0  | 5.3.1   | N/A     |     | N/A   |        |
-| `thumbv7em-none-eabi` [5]            | 2.2.0  | 5.3.1   | N/A     |     | N/A   |        |
-| `thumbv7em-none-eabihf` [5]          | 2.2.0  | 5.3.1   | N/A     |     | N/A   |        |
-| `thumbv7m-none-eabi` [5]             | 2.2.0  | 5.3.1   | N/A     |     | N/A   |        |
-| `wasm32-unknown-emscripten` [6]      | 1.1.15 | 1.37.13 | N/A     | ✓   | N/A   |   ✓    |
-| `x86_64-linux-android` [2]           | N/A    | 4.9     | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `x86_64-pc-windows-gnu`              | N/A    | 7.3.0   | N/A     | ✓   | N/A   |   ✓    |
-| `x86_64-sun-solaris` [4]             | 2.11   | 5.3.0   | 1.0.2p  | ✓   | N/A   |        |
-| `x86_64-unknown-dragonfly` [4] [3]   | 4.6.0  | 5.3.0   | 1.0.2p  | ✓   | N/A   |        |
-| `x86_64-unknown-linux-gnu`           | 2.15   | 4.6.2   | 1.0.2p  | ✓   | N/A   |   ✓    |
-| `x86_64-unknown-linux-musl`          | 1.1.20 | 6.3.0   | 1.0.2p  |     | N/A   |   ✓    |
-| `x86_64-unknown-netbsd` [4]          | 7.0    | 5.3.0   | 1.0.2p  | ✓   | N/A   |        |
+| Target                               |  libc  |   GCC   | C++ | QEMU  | `test` |
+|--------------------------------------|-------:|--------:|:---:|------:|:------:|
+| `*-apple-ios` [1]                    | N/A    | N/A     | N/A | N/A   |   ✓    |
+| `aarch64-linux-android` [2]          | N/A    | 4.9     | ✓   | N/A   |   ✓    |
+| `aarch64-unknown-linux-gnu`          | 2.19   | 4.8.2   | ✓   | 4.1.0 |   ✓    |
+| `aarch64-unknown-linux-musl`         | 1.1.20 | 6.3.0   |     | 4.1.0 |   ✓    |
+| `arm-linux-androideabi` [2]          | N/A    | 4.9     | ✓   | N/A   |   ✓    |
+| `arm-unknown-linux-gnueabi`          | 2.19   | 4.8.2   | ✓   | 4.1.0 |   ✓    |
+| `arm-unknown-linux-gnueabihf`        | 2.27   | 7.3.0   | ✓   | 4.1.0 |   ✓    |
+| `arm-unknown-linux-musleabi`         | 1.1.20 | 6.3.0   |     | 4.1.0 |   ✓    |
+| `arm-unknown-linux-musleabihf`       | 1.1.20 | 6.3.0   |     | 4.1.0 |   ✓    |
+| `armv5te-unknown-linux-musleabi`     | 1.1.20 | 6.3.0   |     | 4.1.0 |   ✓    |
+| `armv7-linux-androideabi` [2]        | N/A    | 4.9     | ✓   | N/A   |   ✓    |
+| `armv7-unknown-linux-gnueabihf`      | 2.15   | 4.6.2   | ✓   | 4.1.0 |   ✓    |
+| `armv7-unknown-linux-musleabihf`     | 1.1.20 | 6.3.0   |     | 4.1.0 |   ✓    |
+| `i586-unknown-linux-gnu`             | 2.23   | 5.3.1   | ✓   | N/A   |   ✓    |
+| `i586-unknown-linux-musl`            | 1.1.20 | 6.3.0   |     | N/A   |   ✓    |
+| `i686-linux-android` [2]             | N/A    | 4.9     | ✓   | N/A   |   ✓    |
+| `i686-unknown-linux-gnu`             | 2.15   | 4.6.2   | ✓   | N/A   |   ✓    |
+| `i686-unknown-linux-musl`            | 1.1.20 | 6.3.0   |     | N/A   |   ✓    |
+| `mips-unknown-linux-gnu`             | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
+| `mips-unknown-linux-musl`            | 1.1.20 | 6.3.0   | ✓   | 4.1.0 |   ✓    |
+| `mips64-unknown-linux-gnuabi64`      | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
+| `mips64el-unknown-linux-gnuabi64`    | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
+| `mipsel-unknown-linux-gnu`           | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
+| `mipsel-unknown-linux-musl`          | 1.1.20 | 6.3.0   | ✓   | 4.1.0 |   ✓    |
+| `powerpc-unknown-linux-gnu`          | 2.19   | 4.8.2   | ✓   | 3.0.1 |   ✓    |
+| `powerpc64-unknown-linux-gnu`        | 2.19   | 4.8.2   | ✓   | 3.0.1 |   ✓    |
+| `powerpc64le-unknown-linux-gnu`      | 2.19   | 4.8.2   | ✓   | 3.0.1 |   ✓    |
+| `s390x-unknown-linux-gnu`            | 2.23   | 5.3.1   | ✓   | 4.1.0 |        |
+| `sparc64-unknown-linux-gnu` [3]      | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
+| `sparcv9-sun-solaris` [4]            | 2.11   | 5.3.0   | ✓   | N/A   |        |
+| `thumbv6m-none-eabi` [5]             | 2.2.0  | 5.3.1   |     | N/A   |        |
+| `thumbv7em-none-eabi` [5]            | 2.2.0  | 5.3.1   |     | N/A   |        |
+| `thumbv7em-none-eabihf` [5]          | 2.2.0  | 5.3.1   |     | N/A   |        |
+| `thumbv7m-none-eabi` [5]             | 2.2.0  | 5.3.1   |     | N/A   |        |
+| `wasm32-unknown-emscripten` [6]      | 1.1.15 | 1.37.13 | ✓   | N/A   |   ✓    |
+| `x86_64-linux-android` [2]           | N/A    | 4.9     | ✓   | N/A   |   ✓    |
+| `x86_64-pc-windows-gnu`              | N/A    | 7.3.0   | ✓   | N/A   |   ✓    |
+| `x86_64-sun-solaris` [4]             | 2.11   | 5.3.0   | ✓   | N/A   |        |
+| `x86_64-unknown-dragonfly` [4] [3]   | 4.6.0  | 5.3.0   | ✓   | N/A   |        |
+| `x86_64-unknown-linux-gnu`           | 2.15   | 4.6.2   | ✓   | N/A   |   ✓    |
+| `x86_64-unknown-linux-musl`          | 1.1.20 | 6.3.0   |     | N/A   |   ✓    |
+| `x86_64-unknown-netbsd` [4]          | 7.0    | 5.3.0   | ✓   | N/A   |        |
 
 [1] iOS cross compilation is supported on macOS hosts.
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d4b647c4e..b89953252 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,48 +19,48 @@ pool:
 
 strategy:
   matrix:
-    aarch64-unknown-linux-gnu:       { TARGET: aarch64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    arm-unknown-linux-gnueabi:       { TARGET: arm-unknown-linux-gnueabi,       CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    arm-unknown-linux-gnueabihf:     { TARGET: arm-unknown-linux-gnueabihf,     CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    armv7-unknown-linux-gnueabihf:   { TARGET: armv7-unknown-linux-gnueabihf,   CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system                                                                     }
-    i586-unknown-linux-gnu:          { TARGET: i586-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    i686-unknown-linux-gnu:          { TARGET: i686-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: native qemu-user qemu-system                                                              }
-    mips-unknown-linux-gnu:          { TARGET: mips-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    mipsel-unknown-linux-gnu:        { TARGET: mipsel-unknown-linux-gnu,        CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    mips64-unknown-linux-gnuabi64:   { TARGET: mips64-unknown-linux-gnuabi64,   CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    mips64el-unknown-linux-gnuabi64: { TARGET: mips64el-unknown-linux-gnuabi64, CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    powerpc-unknown-linux-gnu:       { TARGET: powerpc-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    powerpc64-unknown-linux-gnu:     { TARGET: powerpc64-unknown-linux-gnu,     CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    powerpc64le-unknown-linux-gnu:   { TARGET: powerpc64le-unknown-linux-gnu,   CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-user qemu-system }
-    s390x-unknown-linux-gnu:         { TARGET: s390x-unknown-linux-gnu,         CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-system }
-    sparc64-unknown-linux-gnu:       { TARGET: sparc64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: qemu-system }
-    x86_64-unknown-linux-gnu:        { TARGET: x86_64-unknown-linux-gnu,        CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24, RUN: 1, RUNNERS: native qemu-user qemu-system, DEPLOY: 1, CRATES_IO_PUBLISH: 1 }
-    aarch64-unknown-linux-musl:      { TARGET: aarch64-unknown-linux-musl,                        STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    arm-unknown-linux-musleabihf:    { TARGET: arm-unknown-linux-musleabihf,                      STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    arm-unknown-linux-musleabi:      { TARGET: arm-unknown-linux-musleabi,                        STD: 1, OPENSSL: 0.10.24, RUN: 1 }
+    aarch64-unknown-linux-gnu:       { TARGET: aarch64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    arm-unknown-linux-gnueabi:       { TARGET: arm-unknown-linux-gnueabi,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1 }
+    arm-unknown-linux-gnueabihf:     { TARGET: arm-unknown-linux-gnueabihf,     CPP: 1, DYLIB: 1, STD: 1, RUN: 1 }
+    armv7-unknown-linux-gnueabihf:   { TARGET: armv7-unknown-linux-gnueabihf,   CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system                                                                     }
+    i586-unknown-linux-gnu:          { TARGET: i586-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, RUN: 1 }
+    i686-unknown-linux-gnu:          { TARGET: i686-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: native qemu-user qemu-system                                                              }
+    mips-unknown-linux-gnu:          { TARGET: mips-unknown-linux-gnu,          CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    mipsel-unknown-linux-gnu:        { TARGET: mipsel-unknown-linux-gnu,        CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    mips64-unknown-linux-gnuabi64:   { TARGET: mips64-unknown-linux-gnuabi64,   CPP: 1, DYLIB: 1, STD: 1, RUN: 1 }
+    mips64el-unknown-linux-gnuabi64: { TARGET: mips64el-unknown-linux-gnuabi64, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    powerpc-unknown-linux-gnu:       { TARGET: powerpc-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    powerpc64-unknown-linux-gnu:     { TARGET: powerpc64-unknown-linux-gnu,     CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    powerpc64le-unknown-linux-gnu:   { TARGET: powerpc64le-unknown-linux-gnu,   CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
+    s390x-unknown-linux-gnu:         { TARGET: s390x-unknown-linux-gnu,         CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
+    sparc64-unknown-linux-gnu:       { TARGET: sparc64-unknown-linux-gnu,       CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
+    x86_64-unknown-linux-gnu:        { TARGET: x86_64-unknown-linux-gnu,        CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: native qemu-user qemu-system, DEPLOY: 1, CRATES_IO_PUBLISH: 1 }
+    aarch64-unknown-linux-musl:      { TARGET: aarch64-unknown-linux-musl,                        STD: 1, RUN: 1 }
+    arm-unknown-linux-musleabihf:    { TARGET: arm-unknown-linux-musleabihf,                      STD: 1, RUN: 1 }
+    arm-unknown-linux-musleabi:      { TARGET: arm-unknown-linux-musleabi,                        STD: 1, RUN: 1 }
     armv5te-unknown-linux-musleabi:  { TARGET: armv5te-unknown-linux-musleabi,                    STD: 1,                   RUN: 1 }
-    armv7-unknown-linux-musleabihf:  { TARGET: armv7-unknown-linux-musleabihf,                    STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    i586-unknown-linux-musl:         { TARGET: i586-unknown-linux-musl,                           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    i686-unknown-linux-musl:         { TARGET: i686-unknown-linux-musl,                           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    mips-unknown-linux-musl:         { TARGET: mips-unknown-linux-musl,         CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    mipsel-unknown-linux-musl:       { TARGET: mipsel-unknown-linux-musl,       CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    x86_64-unknown-linux-musl:       { TARGET: x86_64-unknown-linux-musl,                         STD: 1, OPENSSL: 0.10.24, RUN: 1, DEPLOY: 1 }
-    aarch64-linux-android:           { TARGET: aarch64-linux-android,           CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    arm-linux-androideabi:           { TARGET: arm-linux-androideabi,           CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    armv7-linux-androideabi:         { TARGET: armv7-linux-androideabi,         CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    i686-linux-android:              { TARGET: i686-linux-android,              CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
-    x86_64-linux-android:            { TARGET: x86_64-linux-android,            CPP: 1,           STD: 1, OPENSSL: 0.10.24, RUN: 1 }
+    armv7-unknown-linux-musleabihf:  { TARGET: armv7-unknown-linux-musleabihf,                    STD: 1, RUN: 1 }
+    i586-unknown-linux-musl:         { TARGET: i586-unknown-linux-musl,                           STD: 1, RUN: 1 }
+    i686-unknown-linux-musl:         { TARGET: i686-unknown-linux-musl,                           STD: 1, RUN: 1 }
+    mips-unknown-linux-musl:         { TARGET: mips-unknown-linux-musl,         CPP: 1,           STD: 1, RUN: 1 }
+    mipsel-unknown-linux-musl:       { TARGET: mipsel-unknown-linux-musl,       CPP: 1,           STD: 1, RUN: 1 }
+    x86_64-unknown-linux-musl:       { TARGET: x86_64-unknown-linux-musl,                         STD: 1, RUN: 1, DEPLOY: 1 }
+    aarch64-linux-android:           { TARGET: aarch64-linux-android,           CPP: 1,           STD: 1, RUN: 1 }
+    arm-linux-androideabi:           { TARGET: arm-linux-androideabi,           CPP: 1,           STD: 1, RUN: 1 }
+    armv7-linux-androideabi:         { TARGET: armv7-linux-androideabi,         CPP: 1,           STD: 1, RUN: 1 }
+    i686-linux-android:              { TARGET: i686-linux-android,              CPP: 1,           STD: 1, RUN: 1 }
+    x86_64-linux-android:            { TARGET: x86_64-linux-android,            CPP: 1,           STD: 1, RUN: 1 }
     i686-apple-darwin:               { TARGET: i686-apple-darwin,               CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-10.13 }
     x86_64-apple-darwin:             { TARGET: x86_64-apple-darwin,             CPP: 1, DYLIB: 1, STD: 1,                   RUN: 1, VM_IMAGE: macOS-latest, DEPLOY: 1 }
     x86_64-pc-windows-gnu:           { TARGET: x86_64-pc-windows-gnu,           CPP: 1,           STD: 1,                   RUN: 1 }
     # `cargo build` fails with undefined symbols (https://github.com/rust-lang/rust/issues/32859) on `i686-pc-windows-gnu`.
   # i686-pc-windows-gnu:             { TARGET: i686-pc-windows-gnu,             CPP: 1,           STD: 1,                   RUN: 1 }
-    x86_64-unknown-dragonfly:        { TARGET: x86_64-unknown-dragonfly,        CPP: 1, DYLIB: 1,         OPENSSL: 0.10.24,         TOOLCHAIN: nightly }
-  # i686-unknown-freebsd:            { TARGET: i686-unknown-freebsd,                    DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
-  # x86_64-unknown-freebsd:          { TARGET: x86_64-unknown-freebsd,                  DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
-    x86_64-unknown-netbsd:           { TARGET: x86_64-unknown-netbsd,           CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
-    sparcv9-sun-solaris:             { TARGET: sparcv9-sun-solaris,             CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
-    x86_64-sun-solaris:              { TARGET: x86_64-sun-solaris,              CPP: 1, DYLIB: 1, STD: 1, OPENSSL: 0.10.24 }
+    x86_64-unknown-dragonfly:        { TARGET: x86_64-unknown-dragonfly,        CPP: 1, DYLIB: 1,         TOOLCHAIN: nightly }
+  # i686-unknown-freebsd:            { TARGET: i686-unknown-freebsd,                    DYLIB: 1, STD: 1 }
+  # x86_64-unknown-freebsd:          { TARGET: x86_64-unknown-freebsd,                  DYLIB: 1, STD: 1 }
+    x86_64-unknown-netbsd:           { TARGET: x86_64-unknown-netbsd,           CPP: 1, DYLIB: 1, STD: 1 }
+    sparcv9-sun-solaris:             { TARGET: sparcv9-sun-solaris,             CPP: 1, DYLIB: 1, STD: 1 }
+    x86_64-sun-solaris:              { TARGET: x86_64-sun-solaris,              CPP: 1, DYLIB: 1, STD: 1 }
     asmjs-unknown-emscripten:        { TARGET: asmjs-unknown-emscripten,        CPP: 1,           STD: 1,                   RUN: 1 }
     # `cargo run` fails with an assertion error (https://github.com/rust-lang/cargo/issues/4689) on `wasm32-unknown-emscripten`.
     wasm32-unknown-emscripten:       { TARGET: wasm32-unknown-emscripten,       CPP: 1,           STD: 1 }
diff --git a/ci/test.sh b/ci/test.sh
index ea4c9db8d..474e48cad 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 set -ex
 
 function retry {
@@ -73,21 +75,7 @@ EOF
     fi
 
     # `cross build` test for the other targets
-    if [ $OPENSSL ]; then
-        td=$(mktemp -d)
-
-        pushd $td
-        cargo init --bin --name hello .
-        # test that linking (to SSL) works
-        echo "openssl = \"${OPENSSL}\"" >> Cargo.toml
-        echo 'extern crate openssl;' >> src/main.rs
-        retry cargo fetch
-        cross build --target $TARGET
-        popd
-
-        rm -rf $td
-    elif [ "$TARGET" = "asmjs-unknown-emscripten" -o \
-           "$TARGET" = "wasm32-unknown-emscripten" ]; then
+    if [[ "$TARGET" == *-unknown-emscripten ]]; then
         td=$(mktemp -d)
 
         pushd $td
@@ -179,28 +167,6 @@ EOF
 
         rm -rf $td
     fi
-
-    # Test openssl compatibility
-    if [ $OPENSSL ]; then
-        td=$(mktemp -d)
-
-        # If tag name v$OPENSSL fails we try openssl-sys-v$OPENSSL
-        git clone \
-            --depth 1 \
-            --branch openssl-v$OPENSSL \
-            https://github.com/sfackler/rust-openssl $td
-
-        pushd $td
-        # avoid problems building openssl-sys in a virtual workspace
-        rm -f Cargo.toml
-        pushd openssl-sys
-        retry cargo fetch
-        cross build --target $TARGET
-        popd
-        popd
-
-        rm -rf $td
-    fi
 }
 
 cross_run() {
diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android
index 516b11bfa..7c06f8401 100644
--- a/docker/Dockerfile.aarch64-linux-android
+++ b/docker/Dockerfile.aarch64-linux-android
@@ -30,9 +30,6 @@ RUN bash /android-system.sh arm64
 COPY qemu.sh /
 RUN bash /qemu.sh aarch64 android
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-generic64 aarch64-linux-android- -mandroid -fomit-frame-pointer
-
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
 # Libz is distributed in the android ndk, but for some unknown reason it is not
@@ -42,10 +39,6 @@ ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
     CC_aarch64_linux_android=aarch64-linux-android-gcc \
     CXX_aarch64_linux_android=aarch64-linux-android-g++ \
     DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
-    OPENSSL_STATIC=1 \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     HOME=/tmp/ \
     TMPDIR=/tmp/ \
diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu
index 3bc29524a..8ae656b12 100644
--- a/docker/Dockerfile.aarch64-unknown-linux-gnu
+++ b/docker/Dockerfile.aarch64-unknown-linux-gnu
@@ -28,9 +28,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-aarch64-linux-gnu \
     libc6-dev-arm64-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-aarch64 aarch64-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh aarch64 linux softmmu
 
@@ -46,8 +43,5 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner aarch64" \
     CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
     CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/aarch64-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl
index 4e956cc6a..1b4622323 100644
--- a/docker/Dockerfile.aarch64-unknown-linux-musl
+++ b/docker/Dockerfile.aarch64-unknown-linux-musl
@@ -26,9 +26,6 @@ RUN bash /qemu.sh aarch64
 COPY musl.sh /
 RUN bash /musl.sh TARGET=aarch64-linux-musl
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-aarch64 aarch64-linux-musl-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/aarch64-linux-musl/lib/libc.so \
@@ -42,7 +39,4 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER=qemu-aarch64 \
     CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc \
     CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi
index 83e8362af..8942794e5 100644
--- a/docker/Dockerfile.arm-linux-androideabi
+++ b/docker/Dockerfile.arm-linux-androideabi
@@ -30,9 +30,6 @@ RUN bash /android-system.sh arm
 COPY qemu.sh /
 RUN bash /qemu.sh arm android
 
-COPY openssl.sh /
-RUN bash /openssl.sh android arm-linux-androideabi-
-
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
 # Libz is distributed in the android ndk, but for some unknown reason it is not
@@ -42,10 +39,6 @@ ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
     CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
     CXX_arm_linux_androideabi=arm-linux-androideabi-g++ \
     DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
-    OPENSSL_STATIC=1 \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     HOME=/tmp/ \
     TMPDIR=/tmp/ \
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi
index 686c8f132..97d3a73a2 100644
--- a/docker/Dockerfile.arm-unknown-linux-gnueabi
+++ b/docker/Dockerfile.arm-unknown-linux-gnueabi
@@ -24,19 +24,15 @@ COPY cmake.sh /
 RUN apt-get purge --auto-remove -y cmake && \
     bash /cmake.sh
 
-COPY openssl.sh qemu.sh /
+COPY qemu.sh /
 RUN apt-get install -y --no-install-recommends \
     g++-arm-linux-gnueabi \
     libc6-dev-armel-cross && \
-    bash /openssl.sh linux-armv4 arm-linux-gnueabi- && \
     bash /qemu.sh arm
 
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \
     CC_arm_unknown_linux_gnueabi=arm-linux-gnueabi-gcc \
     CXX_arm_unknown_linux_gnueabi=arm-linux-gnueabi-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabi \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf
index 1912dab23..2498c4ddf 100644
--- a/docker/Dockerfile.arm-unknown-linux-gnueabihf
+++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf
@@ -33,21 +33,17 @@ RUN mkdir /usr/arm-linux-gnueabihf && \
 
 ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
 
-COPY openssl.sh qemu.sh /
+COPY qemu.sh /
 
 RUN bash /qemu.sh arm
 
 RUN apt-get install -y --no-install-recommends \
-    libc6-dev-armhf-cross && \
-    bash /openssl.sh linux-armv4 arm-linux-gnueabihf-
+    libc6-dev-armhf-cross
 
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER=qemu-arm \
     CC_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
     CXX_arm_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
     LD_LIBRARY_PATH=/usr/arm-linux-gnueabihf/lib:/usr/arm-linux-gnueabihf/arm-linux-gnueabihf/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.arm-unknown-linux-musleabi b/docker/Dockerfile.arm-unknown-linux-musleabi
index fe161bf0e..c46e3b920 100644
--- a/docker/Dockerfile.arm-unknown-linux-musleabi
+++ b/docker/Dockerfile.arm-unknown-linux-musleabi
@@ -30,9 +30,6 @@ RUN bash /musl.sh \
                       --with-float=soft \
                       --with-mode=arm"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-armv4 arm-linux-musleabi-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/arm-linux-musleabi/lib/libc.so \
@@ -43,7 +40,4 @@ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_LINKER=arm-linux-musleabi-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABI_RUNNER=qemu-arm \
     CC_arm_unknown_linux_musleabi=arm-linux-musleabi-gcc \
     CXX_arm_unknown_linux_musleabi=arm-linux-musleabi-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.arm-unknown-linux-musleabihf b/docker/Dockerfile.arm-unknown-linux-musleabihf
index 4351654fe..70524026b 100644
--- a/docker/Dockerfile.arm-unknown-linux-musleabihf
+++ b/docker/Dockerfile.arm-unknown-linux-musleabihf
@@ -31,9 +31,6 @@ RUN bash /musl.sh \
                       --with-float=hard \
                       --with-mode=arm"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-armv4 arm-linux-musleabihf-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/arm-linux-musleabihf/lib/libc.so \
@@ -44,7 +41,4 @@ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-musleabihf-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER=qemu-arm \
     CC_arm_unknown_linux_musleabihf=arm-linux-musleabihf-gcc \
     CXX_arm_unknown_linux_musleabihf=arm-linux-musleabihf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi
index 790ca1beb..8e20be526 100644
--- a/docker/Dockerfile.armv5te-unknown-linux-musleabi
+++ b/docker/Dockerfile.armv5te-unknown-linux-musleabi
@@ -30,9 +30,6 @@ RUN bash /musl.sh \
                       --with-float=soft \
                       --with-mode=arm"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-armv4 arm-linux-musleabi-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/arm-linux-musleabi/lib/libc.so \
@@ -43,7 +40,4 @@ ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_MUSLEABI_LINKER=arm-linux-musleabi-gcc \
     CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_MUSLEABI_RUNNER=qemu-arm \
     CC_armv5te_unknown_linux_musleabi=arm-linux-musleabi-gcc \
     CXX_armv5te_unknown_linux_musleabi=arm-linux-musleabi-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi
index 416e14978..429fb8e3c 100644
--- a/docker/Dockerfile.armv7-linux-androideabi
+++ b/docker/Dockerfile.armv7-linux-androideabi
@@ -30,9 +30,6 @@ RUN bash /android-system.sh arm
 COPY qemu.sh /
 RUN bash /qemu.sh arm android
 
-COPY openssl.sh /
-RUN bash /openssl.sh android-armv7 arm-linux-androideabi-
-
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
 # Libz is distributed in the android ndk, but for some unknown reason it is not
@@ -42,10 +39,6 @@ ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
     CC_armv7_linux_androideabi=arm-linux-androideabi-gcc \
     CXX_armv7_linux_androideabi=arm-linux-androideabi-g++ \
     DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
-    OPENSSL_STATIC=1 \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     HOME=/tmp/ \
     TMPDIR=/tmp/ \
diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
index cb3b0afda..582740913 100644
--- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf
+++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -28,9 +28,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-arm-linux-gnueabihf \
     libc6-dev-armhf-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-armv4 arm-linux-gnueabihf-
-
 COPY qemu.sh /
 RUN bash /qemu.sh arm linux softmmu
 
@@ -46,8 +43,5 @@ ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="/linux-runner armv7" \
     CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
     CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabihf b/docker/Dockerfile.armv7-unknown-linux-musleabihf
index 2f37309dc..7451662c9 100644
--- a/docker/Dockerfile.armv7-unknown-linux-musleabihf
+++ b/docker/Dockerfile.armv7-unknown-linux-musleabihf
@@ -30,9 +30,6 @@ RUN bash /musl.sh \
                       --with-float=hard \
                       --with-mode=thumb"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-armv4 arm-linux-musleabihf-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/arm-linux-musleabihf/lib/libc.so \
@@ -43,7 +40,4 @@ ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-musleabihf-gcc
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_RUNNER=qemu-arm \
     CC_armv7_unknown_linux_musleabihf=arm-linux-musleabihf-gcc \
     CXX_armv7_unknown_linux_musleabihf=arm-linux-musleabihf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu
index 0307cf493..f2cc2bd95 100644
--- a/docker/Dockerfile.i586-unknown-linux-gnu
+++ b/docker/Dockerfile.i586-unknown-linux-gnu
@@ -20,11 +20,5 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY openssl.sh /
 RUN apt-get install -y --no-install-recommends \
-    g++-multilib && \
-    bash /openssl.sh linux-elf "" -m32
-
-ENV OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    g++-multilib
diff --git a/docker/Dockerfile.i586-unknown-linux-musl b/docker/Dockerfile.i586-unknown-linux-musl
index 7b8328411..abe6fe71e 100644
--- a/docker/Dockerfile.i586-unknown-linux-musl
+++ b/docker/Dockerfile.i586-unknown-linux-musl
@@ -23,12 +23,6 @@ RUN bash /xargo.sh
 COPY musl.sh /
 RUN bash /musl.sh TARGET=i586-linux-musl
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-elf i586-linux-musl-
-
 ENV CARGO_TARGET_I586_UNKNOWN_LINUX_MUSL_LINKER=i586-linux-musl-gcc \
     CC_i586_unknown_linux_musl=i586-linux-musl-gcc \
-    CXX_i586_unknown_linux_musl=i586-linux-musl-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_i586_unknown_linux_musl=i586-linux-musl-g++
diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android
index 0dabb49e8..da7e081d1 100644
--- a/docker/Dockerfile.i686-linux-android
+++ b/docker/Dockerfile.i686-linux-android
@@ -37,10 +37,6 @@ RUN bash /android-system.sh x86
 COPY qemu.sh /
 RUN bash /qemu.sh i386 android
 
-# Build with no-asm to make openssl linked binaries position-independent (PIE)
-COPY openssl.sh /
-RUN bash /openssl.sh android-x86 i686-linux-android- no-asm
-
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
 # Libz is distributed in the android ndk, but for some unknown reason it is not
@@ -51,10 +47,6 @@ ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
     CXX_i686_linux_android=i686-linux-android-g++ \
     DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
     LIBZ_SYS_STATIC=1 \
-    OPENSSL_STATIC=1 \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     HOME=/tmp/ \
     TMPDIR=/tmp/ \
diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu
index c7e5e3a02..ce3cdd0b6 100644
--- a/docker/Dockerfile.i686-unknown-linux-gnu
+++ b/docker/Dockerfile.i686-unknown-linux-gnu
@@ -27,9 +27,6 @@ RUN apt-get purge --auto-remove -y cmake && \
 RUN apt-get install -y --no-install-recommends \
     g++-multilib
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-elf "" -m32
-
 COPY qemu.sh /
 RUN bash /qemu.sh i386 linux softmmu
 
@@ -41,7 +38,4 @@ RUN bash /linux-image.sh i686
 
 COPY linux-runner /
 
-ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner i686" \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner i686"
diff --git a/docker/Dockerfile.i686-unknown-linux-musl b/docker/Dockerfile.i686-unknown-linux-musl
index fb0e6edfe..6c7001a37 100644
--- a/docker/Dockerfile.i686-unknown-linux-musl
+++ b/docker/Dockerfile.i686-unknown-linux-musl
@@ -23,12 +23,6 @@ RUN bash /xargo.sh
 COPY musl.sh /
 RUN bash /musl.sh TARGET=i686-linux-musl
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-elf i686-linux-musl-
-
 ENV CARGO_TARGET_I686_UNKNOWN_LINUX_MUSL_LINKER=i686-linux-musl-gcc \
     CC_i686_unknown_linux_musl=i686-linux-musl-gcc \
-    CXX_i686_unknown_linux_musl=i686-linux-musl-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_i686_unknown_linux_musl=i686-linux-musl-g++
diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu
index e8144976a..c17e26ea4 100644
--- a/docker/Dockerfile.mips-unknown-linux-gnu
+++ b/docker/Dockerfile.mips-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-mips-linux-gnu \
     libc6-dev-mips-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-mips32 mips-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh mips linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER=mips-linux-gnu-gcc \
     CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner mips" \
     CC_mips_unknown_linux_gnu=mips-linux-gnu-gcc \
     CXX_mips_unknown_linux_gnu=mips-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/mips-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.mips-unknown-linux-musl b/docker/Dockerfile.mips-unknown-linux-musl
index a3ffee23f..302c06a41 100644
--- a/docker/Dockerfile.mips-unknown-linux-musl
+++ b/docker/Dockerfile.mips-unknown-linux-musl
@@ -28,9 +28,6 @@ RUN bash /musl.sh \
     TARGET=mips-linux-muslsf \
     "COMMON_CONFIG += -with-arch=mips32r2"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-mips32 mips-linux-muslsf-
-
 # Allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/mips-linux-muslsf/lib/libc.so \
@@ -41,8 +38,5 @@ ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_MUSL_LINKER=mips-linux-muslsf-gcc \
     CARGO_TARGET_MIPS_UNKNOWN_LINUX_MUSL_RUNNER=qemu-mips \
     CC_mips_unknown_linux_musl=mips-linux-muslsf-gcc \
     CXX_mips_unknown_linux_musl=mips-linux-muslsf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     QEMU_LD_PREFIX=/usr/local/mips-linux-muslsf
diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64
index f9d90d470..a1a46e74e 100644
--- a/docker/Dockerfile.mips64-unknown-linux-gnuabi64
+++ b/docker/Dockerfile.mips64-unknown-linux-gnuabi64
@@ -20,19 +20,15 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY openssl.sh qemu.sh /
+COPY qemu.sh /
 RUN apt-get install -y --no-install-recommends \
     g++-mips64-linux-gnuabi64 \
     libc6-dev-mips64-cross && \
-    bash /openssl.sh linux64-mips64 mips64-linux-gnuabi64- && \
     bash /qemu.sh mips64
 
 ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
     CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER=qemu-mips64 \
     CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
     CXX_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/mips64-linux-gnuabi64 \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
index 13adf36f4..f00e0e560 100644
--- a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
+++ b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-mips64el-linux-gnuabi64 \
     libc6-dev-mips64el-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux64-mips64 mips64el-linux-gnuabi64-
-
 COPY qemu.sh /
 RUN bash /qemu.sh mips64el linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-
     CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="/linux-runner mips64el" \
     CC_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-gcc \
     CXX_mips64el_unknown_linux_gnuabi64=mips64el-linux-gnuabi64-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/mips64el-linux-gnuabi64 \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu
index 49371f335..f24762e8d 100644
--- a/docker/Dockerfile.mipsel-unknown-linux-gnu
+++ b/docker/Dockerfile.mipsel-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-mipsel-linux-gnu \
     libc6-dev-mipsel-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-mips32 mipsel-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh mipsel linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER=mipsel-linux-gnu-gcc \
     CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner mipsel" \
     CC_mipsel_unknown_linux_gnu=mipsel-linux-gnu-gcc \
     CXX_mipsel_unknown_linux_gnu=mipsel-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/mipsel-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.mipsel-unknown-linux-musl b/docker/Dockerfile.mipsel-unknown-linux-musl
index c453d016f..ab2404a95 100644
--- a/docker/Dockerfile.mipsel-unknown-linux-musl
+++ b/docker/Dockerfile.mipsel-unknown-linux-musl
@@ -28,9 +28,6 @@ RUN bash /musl.sh \
     TARGET=mipsel-linux-muslsf \
     "COMMON_CONFIG += -with-arch=mips32"
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-mips32 mipsel-linux-muslsf-
-
 # This allows qemu run dynamic linked binaries
 RUN ln -sf \
     /usr/local/mipsel-linux-muslsf/lib/libc.so \
@@ -41,7 +38,4 @@ ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_LINKER=mipsel-linux-muslsf-gcc \
     CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER=qemu-mipsel \
     CC_mipsel_unknown_linux_musl=mipsel-linux-muslsf-gcc \
     CXX_mipsel_unknown_linux_musl=mipsel-linux-muslsf-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu
index c66790b55..510a52171 100644
--- a/docker/Dockerfile.powerpc-unknown-linux-gnu
+++ b/docker/Dockerfile.powerpc-unknown-linux-gnu
@@ -28,9 +28,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-powerpc-linux-gnu \
     libc6-dev-powerpc-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-ppc powerpc-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh ppc linux softmmu
 
@@ -46,8 +43,5 @@ ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
     CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner powerpc" \
     CC_powerpc_unknown_linux_gnu=powerpc-linux-gnu-gcc \
     CXX_powerpc_unknown_linux_gnu=powerpc-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/powerpc-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu
index 95b66cc7b..2e61a772a 100644
--- a/docker/Dockerfile.powerpc64-unknown-linux-gnu
+++ b/docker/Dockerfile.powerpc64-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-powerpc64-linux-gnu \
     libc6-dev-ppc64-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-ppc64 powerpc64-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh ppc64 linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
     CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner powerpc64" \
     CC_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-gcc \
     CXX_powerpc64_unknown_linux_gnu=powerpc64-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/powerpc64-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu
index d2384fe59..0bd56be75 100644
--- a/docker/Dockerfile.powerpc64le-unknown-linux-gnu
+++ b/docker/Dockerfile.powerpc64le-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-powerpc64le-linux-gnu \
     libc6-dev-ppc64el-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-ppc64le powerpc64le-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh ppc64le linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc
     CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner powerpc64le" \
     CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
     CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/powerpc64le-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu
index 985ebdef2..b9c9693e2 100644
--- a/docker/Dockerfile.s390x-unknown-linux-gnu
+++ b/docker/Dockerfile.s390x-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-s390x-linux-gnu \
     libc6-dev-s390x-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux64-s390x s390x-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh s390x linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
     CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner s390x" \
     CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
     CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/s390x-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu
index bb41a0f41..62c7d10ee 100644
--- a/docker/Dockerfile.sparc64-unknown-linux-gnu
+++ b/docker/Dockerfile.sparc64-unknown-linux-gnu
@@ -24,9 +24,6 @@ RUN apt-get install -y --no-install-recommends \
     g++-sparc64-linux-gnu \
     libc6-dev-sparc64-cross
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux64-sparcv9 sparc64-linux-gnu-
-
 COPY qemu.sh /
 RUN bash /qemu.sh sparc64 linux softmmu
 
@@ -42,8 +39,5 @@ ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
     CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner sparc64" \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \
     CXX_sparc64_unknown_linux_gnu=sparc64-linux-gnu-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     QEMU_LD_PREFIX=/usr/sparc64-linux-gnu \
     RUST_TEST_THREADS=1
diff --git a/docker/Dockerfile.sparcv9-sun-solaris b/docker/Dockerfile.sparcv9-sun-solaris
index 1995181da..c8fce31b8 100644
--- a/docker/Dockerfile.sparcv9-sun-solaris
+++ b/docker/Dockerfile.sparcv9-sun-solaris
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY solaris.sh openssl.sh /
-RUN bash /solaris.sh sparcv9 && \
-    bash /openssl.sh solaris64-sparcv9-gcc sparcv9-sun-solaris2.10-
+COPY solaris.sh /
+RUN bash /solaris.sh sparcv9
 
 ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.10-gcc \
     CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
-    CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-g++
diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android
index 3fa27841a..888086419 100644
--- a/docker/Dockerfile.x86_64-linux-android
+++ b/docker/Dockerfile.x86_64-linux-android
@@ -31,9 +31,6 @@ RUN bash /android-system.sh x86_64
 COPY qemu.sh /
 RUN bash /qemu.sh x86_64 android
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-x86_64 x86_64-linux-android- -mandroid -fomit-frame-pointer
-
 RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
 
 # Libz is distributed in the android ndk, but for some unknown reason it is not
@@ -43,10 +40,6 @@ ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
     CC_x86_64_linux_android=x86_64-linux-android-gcc \
     CXX_x86_64_linux_android=x86_64-linux-android-g++ \
     DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
-    OPENSSL_STATIC=1 \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib \
     RUST_TEST_THREADS=1 \
     HOME=/tmp/ \
     TMPDIR=/tmp/ \
diff --git a/docker/Dockerfile.x86_64-sun-solaris b/docker/Dockerfile.x86_64-sun-solaris
index 8c8e8f225..4647885f8 100644
--- a/docker/Dockerfile.x86_64-sun-solaris
+++ b/docker/Dockerfile.x86_64-sun-solaris
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY solaris.sh openssl.sh /
-RUN bash /solaris.sh x86_64 && \
-    bash /openssl.sh solaris64-x86_64-gcc x86_64-sun-solaris2.10-
+COPY solaris.sh /
+RUN bash /solaris.sh x86_64
 
 ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.10-gcc \
     CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
-    CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_x86_64_sun_solaris=x86_64-sun-solaris2.10-g++
diff --git a/docker/Dockerfile.x86_64-unknown-dragonfly b/docker/Dockerfile.x86_64-unknown-dragonfly
index c14ac287d..8a2e37a4e 100644
--- a/docker/Dockerfile.x86_64-unknown-dragonfly
+++ b/docker/Dockerfile.x86_64-unknown-dragonfly
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY dragonfly.sh openssl.sh /
-RUN bash /dragonfly.sh && \
-    bash /openssl.sh BSD-x86_64 x86_64-unknown-dragonfly-
+COPY dragonfly.sh /
+RUN bash /dragonfly.sh
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_DRAGONFLY_LINKER=x86_64-unknown-dragonfly-gcc \
     CC_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-gcc \
-    CXX_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_x86_64_unknown_dragonfly=x86_64-unknown-dragonfly-g++
diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu
index 7eb8976a0..75871aa5d 100644
--- a/docker/Dockerfile.x86_64-unknown-linux-gnu
+++ b/docker/Dockerfile.x86_64-unknown-linux-gnu
@@ -28,9 +28,6 @@ RUN apt-get install -y --no-install-recommends \
     g++ \
     zlib1g-dev
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-x86_64
-
 COPY qemu.sh /
 RUN bash /qemu.sh x86_64 linux softmmu
 
@@ -42,7 +39,4 @@ RUN bash /linux-image.sh x86_64
 
 COPY linux-runner /
 
-ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner x86_64" \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner x86_64"
diff --git a/docker/Dockerfile.x86_64-unknown-linux-musl b/docker/Dockerfile.x86_64-unknown-linux-musl
index 5b9380a35..ce118285c 100644
--- a/docker/Dockerfile.x86_64-unknown-linux-musl
+++ b/docker/Dockerfile.x86_64-unknown-linux-musl
@@ -23,12 +23,6 @@ RUN bash /xargo.sh
 COPY musl.sh /
 RUN bash /musl.sh TARGET=x86_64-linux-musl
 
-COPY openssl.sh /
-RUN bash /openssl.sh linux-x86_64 x86_64-linux-musl-
-
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-linux-musl-gcc \
     CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
-    CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
diff --git a/docker/Dockerfile.x86_64-unknown-netbsd b/docker/Dockerfile.x86_64-unknown-netbsd
index 2020c9654..bb3126564 100644
--- a/docker/Dockerfile.x86_64-unknown-netbsd
+++ b/docker/Dockerfile.x86_64-unknown-netbsd
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY netbsd.sh openssl.sh /
-RUN bash /netbsd.sh && \
-    bash /openssl.sh BSD-x86_64 x86_64-unknown-netbsd-
+COPY netbsd.sh /
+RUN bash /netbsd.sh
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_NETBSD_LINKER=x86_64-unknown-netbsd-gcc \
     CC_x86_64_unknown_netbsd=x86_64-unknown-netbsd-gcc \
-    CXX_x86_64_unknown_netbsd=x86_64-unknown-netbsd-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_x86_64_unknown_netbsd=x86_64-unknown-netbsd-g++
diff --git a/docker/disabled/Dockerfile.i686-unknown-freebsd b/docker/disabled/Dockerfile.i686-unknown-freebsd
index f773488e8..6fd124bd1 100644
--- a/docker/disabled/Dockerfile.i686-unknown-freebsd
+++ b/docker/disabled/Dockerfile.i686-unknown-freebsd
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY freebsd.sh openssl.sh /
-RUN bash /freebsd.sh i686 && \
-    bash /openssl.sh BSD-x86-elf i686-unknown-freebsd10-
+COPY freebsd.sh /
+RUN bash /freebsd.sh i686
 
 ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd10-gcc \
     CC_i686_unknown_freebsd=i686-unknown-freebsd10-gcc \
-    CXX_i686_unknown_freebsd=i686-unknown-freebsd10-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_i686_unknown_freebsd=i686-unknown-freebsd10-g++
diff --git a/docker/disabled/Dockerfile.x86_64-unknown-freebsd b/docker/disabled/Dockerfile.x86_64-unknown-freebsd
index 8d846a340..a128e42fd 100644
--- a/docker/disabled/Dockerfile.x86_64-unknown-freebsd
+++ b/docker/disabled/Dockerfile.x86_64-unknown-freebsd
@@ -20,13 +20,9 @@ RUN apt-get update && \
 COPY xargo.sh /
 RUN bash /xargo.sh
 
-COPY freebsd.sh openssl.sh /
-RUN bash /freebsd.sh x86_64 && \
-    bash /openssl.sh BSD-x86_64 x86_64-unknown-freebsd10-
+COPY freebsd.sh /
+RUN bash /freebsd.sh x86_64
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc \
     CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc \
-    CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-g++ \
-    OPENSSL_DIR=/openssl \
-    OPENSSL_INCLUDE_DIR=/openssl/include \
-    OPENSSL_LIB_DIR=/openssl/lib
+    CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-g++
diff --git a/docker/openssl.sh b/docker/openssl.sh
deleted file mode 100644
index 8e72873c2..000000000
--- a/docker/openssl.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-set -ex
-
-main() {
-    local version=1.0.2t
-    local os=$1 \
-          triple=$2
-
-    local dependencies=(
-        ca-certificates
-        curl
-        m4
-        make
-        perl
-    )
-
-    # NOTE cross toolchain must be already installed
-    apt-get update
-    local purge_list=()
-    for dep in ${dependencies[@]}; do
-        if ! dpkg -L $dep; then
-            apt-get install --no-install-recommends -y $dep
-            purge_list+=( $dep )
-        fi
-    done
-
-    td=$(mktemp -d)
-
-    pushd $td
-    curl https://www.openssl.org/source/openssl-$version.tar.gz | \
-        tar --strip-components=1 -xz
-    AR=${triple}ar CC=${triple}gcc ./Configure \
-      --prefix=/openssl \
-      no-dso \
-      $os \
-      -fPIC \
-      ${@:3}
-    nice make -j$(nproc)
-    make install
-
-    # clean up
-    apt-get purge --auto-remove -y ${purge_list[@]}
-
-    popd
-
-    rm -rf $td
-    rm $0
-}
-
-main "${@}"