Repository: rust-cross/rust-musl-cross (language: rust)

Issue:
Remove OpenSSL
See https://github.com/rust-embedded/cross/issues/229

It's better to just use the `openssl-src` crate.


Discussion / hints:

Fix patch:
diff --git a/.github/targets.json b/.github/targets.json
index c82185e..8045abb 100644
--- a/.github/targets.json
+++ b/.github/targets.json
@@ -2,99 +2,85 @@
     {
         "IMAGE_TAG": "aarch64-musl",
         "TARGET": "aarch64-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-aarch64",
         "RUST_MUSL_MAKE_CONFIG": "config.mak",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "arm-musleabi",
         "TARGET": "arm-unknown-linux-musleabi",
-        "OPENSSL_ARCH": "linux-armv4",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "arm-musleabihf",
         "TARGET": "arm-unknown-linux-musleabihf",
-        "OPENSSL_ARCH": "linux-armv4",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "armv5te-musleabi",
         "TARGET": "armv5te-unknown-linux-musleabi",
-        "OPENSSL_ARCH": "linux-armv4",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "armv7-musleabi",
         "TARGET": "armv7-unknown-linux-musleabi",
-        "OPENSSL_ARCH": "linux-armv4",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "armv7-musleabihf",
         "TARGET": "armv7-unknown-linux-musleabihf",
-        "OPENSSL_ARCH": "linux-armv4",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "i586-musl",
         "TARGET": "i586-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-elf",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "i686-musl",
         "TARGET": "i686-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-elf",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "mips-musl",
         "TARGET": "mips-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-mips32",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "mips64-muslabi64",
         "TARGET": "mips64-unknown-linux-muslabi64",
-        "OPENSSL_ARCH": "linux64-mips64",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "mips64el-muslabi64",
         "TARGET": "mips64el-unknown-linux-muslabi64",
-        "OPENSSL_ARCH": "linux64-mips64",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "mipsel-musl",
         "TARGET": "mipsel-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-mips32",
         "RUST_MUSL_MAKE_CONFIG": "config.mak.32",
         "TOOLCHAIN": "stable"
     },
     {
         "IMAGE_TAG": "powerpc64le-musl",
         "TARGET": "powerpc64le-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-ppc64le",
         "RUST_MUSL_MAKE_CONFIG": "config.mak",
         "TOOLCHAIN": "nightly"
     },
     {
         "IMAGE_TAG": "x86_64-musl",
         "TARGET": "x86_64-unknown-linux-musl",
-        "OPENSSL_ARCH": "linux-x86_64",
         "RUST_MUSL_MAKE_CONFIG": "config.mak",
         "TOOLCHAIN": "stable"
     }
-]
\ No newline at end of file
+]
diff --git a/.github/workflow.yml.template b/.github/workflow.yml.template
index d6704f8..82ab615 100644
--- a/.github/workflow.yml.template
+++ b/.github/workflow.yml.template
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/aarch64-musl_arm-musleabi.yml b/.github/workflows/aarch64-musl_arm-musleabi.yml
index 0b51ca6..0c11dd9 100644
--- a/.github/workflows/aarch64-musl_arm-musleabi.yml
+++ b/.github/workflows/aarch64-musl_arm-musleabi.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "aarch64-musl", "TARGET": "aarch64-unknown-linux-musl", "OPENSSL_ARCH": "linux-aarch64", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "arm-musleabi", "TARGET": "arm-unknown-linux-musleabi", "OPENSSL_ARCH": "linux-armv4", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "aarch64-musl", "TARGET": "aarch64-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "arm-musleabi", "TARGET": "arm-unknown-linux-musleabi", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/arm-musleabihf_armv5te-musleabi.yml b/.github/workflows/arm-musleabihf_armv5te-musleabi.yml
index dbf1335..675c783 100644
--- a/.github/workflows/arm-musleabihf_armv5te-musleabi.yml
+++ b/.github/workflows/arm-musleabihf_armv5te-musleabi.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "arm-musleabihf", "TARGET": "arm-unknown-linux-musleabihf", "OPENSSL_ARCH": "linux-armv4", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "armv5te-musleabi", "TARGET": "armv5te-unknown-linux-musleabi", "OPENSSL_ARCH": "linux-armv4", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "arm-musleabihf", "TARGET": "arm-unknown-linux-musleabihf", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "armv5te-musleabi", "TARGET": "armv5te-unknown-linux-musleabi", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/armv7-musleabi_armv7-musleabihf.yml b/.github/workflows/armv7-musleabi_armv7-musleabihf.yml
index ce84a2f..065492d 100644
--- a/.github/workflows/armv7-musleabi_armv7-musleabihf.yml
+++ b/.github/workflows/armv7-musleabi_armv7-musleabihf.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "armv7-musleabi", "TARGET": "armv7-unknown-linux-musleabi", "OPENSSL_ARCH": "linux-armv4", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "armv7-musleabihf", "TARGET": "armv7-unknown-linux-musleabihf", "OPENSSL_ARCH": "linux-armv4", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "armv7-musleabi", "TARGET": "armv7-unknown-linux-musleabi", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "armv7-musleabihf", "TARGET": "armv7-unknown-linux-musleabihf", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/i586-musl_i686-musl.yml b/.github/workflows/i586-musl_i686-musl.yml
index 3884e6f..20a357c 100644
--- a/.github/workflows/i586-musl_i686-musl.yml
+++ b/.github/workflows/i586-musl_i686-musl.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "i586-musl", "TARGET": "i586-unknown-linux-musl", "OPENSSL_ARCH": "linux-elf", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "i686-musl", "TARGET": "i686-unknown-linux-musl", "OPENSSL_ARCH": "linux-elf", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "i586-musl", "TARGET": "i586-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "i686-musl", "TARGET": "i686-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/mips-musl_mips64-muslabi64.yml b/.github/workflows/mips-musl_mips64-muslabi64.yml
index 0a2de64..26310c5 100644
--- a/.github/workflows/mips-musl_mips64-muslabi64.yml
+++ b/.github/workflows/mips-musl_mips64-muslabi64.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "mips-musl", "TARGET": "mips-unknown-linux-musl", "OPENSSL_ARCH": "linux-mips32", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "mips64-muslabi64", "TARGET": "mips64-unknown-linux-muslabi64", "OPENSSL_ARCH": "linux64-mips64", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "mips-musl", "TARGET": "mips-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "mips64-muslabi64", "TARGET": "mips64-unknown-linux-muslabi64", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/mips64el-muslabi64_mipsel-musl.yml b/.github/workflows/mips64el-muslabi64_mipsel-musl.yml
index fa9fc74..476a6c9 100644
--- a/.github/workflows/mips64el-muslabi64_mipsel-musl.yml
+++ b/.github/workflows/mips64el-muslabi64_mipsel-musl.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "mips64el-muslabi64", "TARGET": "mips64el-unknown-linux-muslabi64", "OPENSSL_ARCH": "linux64-mips64", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "mipsel-musl", "TARGET": "mipsel-unknown-linux-musl", "OPENSSL_ARCH": "linux-mips32", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "mips64el-muslabi64", "TARGET": "mips64el-unknown-linux-muslabi64", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}, {"IMAGE_TAG": "mipsel-musl", "TARGET": "mipsel-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak.32", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/.github/workflows/powerpc64le-musl_x86_64-musl.yml b/.github/workflows/powerpc64le-musl_x86_64-musl.yml
index 527d60d..f8e0423 100644
--- a/.github/workflows/powerpc64le-musl_x86_64-musl.yml
+++ b/.github/workflows/powerpc64le-musl_x86_64-musl.yml
@@ -1,5 +1,7 @@
 on:
   push:
+    branches:
+      - master
   pull_request:
   schedule:
     - cron: '0 0 * * 2'
@@ -26,7 +28,7 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           ecs-image-id: 93b1fc8d-ee4e-4126-950e-8f4404408acc
-          ecs-instance-type: kc1.xlarge.2
+          ecs-instance-type: kc1.large.2
           vpc-id: ${{ secrets.VPC_ID }}
           subnet-id: ${{ secrets.SUBNET_ID }}
           security-group-id: ${{ secrets.SECURITY_GROUP_ID }}
@@ -42,7 +44,7 @@ jobs:
             label: ['ubuntu-latest']
           - arch: 'arm64'
             label: ${{ needs.start-runner.outputs.label }}
-        env: [{"IMAGE_TAG": "powerpc64le-musl", "TARGET": "powerpc64le-unknown-linux-musl", "OPENSSL_ARCH": "linux-ppc64le", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "nightly"}, {"IMAGE_TAG": "x86_64-musl", "TARGET": "x86_64-unknown-linux-musl", "OPENSSL_ARCH": "linux-x86_64", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "stable"}]
+        env: [{"IMAGE_TAG": "powerpc64le-musl", "TARGET": "powerpc64le-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "nightly"}, {"IMAGE_TAG": "x86_64-musl", "TARGET": "x86_64-unknown-linux-musl", "RUST_MUSL_MAKE_CONFIG": "config.mak", "TOOLCHAIN": "stable"}]
     env: ${{ matrix.env }}
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +73,6 @@ jobs:
           platforms: linux/${{ matrix.os.arch }}
           build-args: |
             TARGET=${{ matrix.env.TARGET }}
-            OPENSSL_ARCH=${{ matrix.env.OPENSSL_ARCH }}
             RUST_MUSL_MAKE_CONFIG=${{ matrix.env.RUST_MUSL_MAKE_CONFIG }}
             TOOLCHAIN=${{ matrix.env.TOOLCHAIN }}
           tags: messense/rust-musl-cross:${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
@@ -86,6 +87,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Test Docker cargo build
+        if: ${{ !startsWith(matrix.env.TARGET, 'armv5te') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
@@ -130,4 +132,4 @@ jobs:
           project-id: ${{ secrets.PROJECT_ID }}
           availability-zone: ap-southeast-1b
           label: ${{ needs.start-runner.outputs.label }}
-          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
\ No newline at end of file
+          ecs-instance-id: ${{ needs.start-runner.outputs.ecs-instance-id }}
diff --git a/Dockerfile b/Dockerfile
index 0d19208..4c3f0b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,6 @@
 FROM ubuntu:20.04
 
-ARG TARGET=x86_64-unknown-linux-musl
-ARG OPENSSL_ARCH=linux-x86_64
-ARG RUST_MUSL_MAKE_VER=0.9.9
-ARG RUST_MUSL_MAKE_CONFIG=config.mak
-
 ENV DEBIAN_FRONTEND=noninteractive
-ENV RUST_MUSL_CROSS_TARGET=$TARGET
 
 # Make sure we have basic dev tools for building C libraries.  Our goal
 # here is to support the musl-libc builds and Cargo builds needed for a
@@ -37,6 +31,11 @@ RUN apt-get update && \
 COPY lets-encrypt-r3-cross-signed.crt /usr/local/share/ca-certificates
 RUN update-ca-certificates
 
+ARG TARGET=x86_64-unknown-linux-musl
+ENV RUST_MUSL_CROSS_TARGET=$TARGET
+ARG RUST_MUSL_MAKE_VER=0.9.9
+ARG RUST_MUSL_MAKE_CONFIG=config.mak
+
 COPY $RUST_MUSL_MAKE_CONFIG /tmp/config.mak
 RUN cd /tmp && curl -Lsq -o musl-cross-make.zip https://github.com/richfelker/musl-cross-make/archive/v$RUST_MUSL_MAKE_VER.zip && \
     unzip -q musl-cross-make.zip && \
@@ -65,8 +64,6 @@ ENV TARGET_C_INCLUDE_PATH=$TARGET_HOME/include/
 # clean up when you're done.
 WORKDIR /home/rust/libs
 
-# Build a static library version of OpenSSL using musl-libc.  This is
-# needed by the popular Rust `hyper` crate.
 RUN export CC=$TARGET_CC && \
     export C_INCLUDE_PATH=$TARGET_C_INCLUDE_PATH && \
     echo "Building zlib" && \
@@ -81,26 +78,6 @@ RUN export CC=$TARGET_CC && \
     make -j$(nproc) && make install && \
     cd .. && rm -rf zlib-$VERS.tar.gz zlib-$VERS checksums.txt
 
-RUN export CC=$TARGET_CC && \
-    export C_INCLUDE_PATH=$TARGET_C_INCLUDE_PATH && \
-    export LD=$TARGET-ld && \
-    echo "Building OpenSSL" && \
-    VERS=1.0.2u && \
-    CHECKSUM=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 && \
-    curl -sqO https://www.openssl.org/source/openssl-$VERS.tar.gz && \
-    echo "$CHECKSUM openssl-$VERS.tar.gz" > checksums.txt && \
-    sha256sum -c checksums.txt && \
-    tar xzf openssl-$VERS.tar.gz && cd openssl-$VERS && \
-    ./Configure $OPENSSL_ARCH -fPIC --prefix=$TARGET_HOME && \
-    make -j$(nproc) && make install && \
-    cd .. && rm -rf openssl-$VERS.tar.gz openssl-$VERS checksums.txt
-
-ENV OPENSSL_DIR=$TARGET_HOME/ \
-    OPENSSL_INCLUDE_DIR=$TARGET_HOME/include/ \
-    DEP_OPENSSL_INCLUDE=$TARGET_HOME/include/ \
-    OPENSSL_LIB_DIR=$TARGET_HOME/lib/ \
-    OPENSSL_STATIC=1
-
 # The Rust toolchain to use when building our image
 ARG TOOLCHAIN=stable
 # Install our Rust toolchain and the `musl` target.  We patch the
diff --git a/README.md b/README.md
index 5bb57b1..575d0dc 100644
--- a/README.md
+++ b/README.md
@@ -47,27 +47,8 @@ At the moment, it doesn't attempt to cache libraries between builds, so this is
 ## How it works
 
 `rust-musl-cross` uses [musl-libc][], [musl-gcc][] with the help of [musl-cross-make][] to make it easy to compile, and the new
-[rustup][] `target` support.  It includes static versions of several
-libraries:
+[rustup][] `target` support.
 
-- The standard `musl-libc` libraries.
-- OpenSSL, which is needed by many Rust applications.
-
-## Making OpenSSL work
-
-If your application uses OpenSSL, you will also need to take a few extra steps
-to make sure that it can find OpenSSL's list of trusted certificates,
-which is stored in different locations on different Linux distributions.
-You can do this using [`openssl-probe`](https://crates.io/crates/openssl-probe) as follows:
-
-```rust
-extern crate openssl_probe;
-
-fn main() {
-    openssl_probe::init_ssl_cert_env_vars();
-    //... your code
-}
-```
 
 ## Use beta/nightly Rust
 
diff --git a/build-arm64.sh b/build-arm64.sh
index c3caca4..35439cb 100755
--- a/build-arm64.sh
+++ b/build-arm64.sh
@@ -4,30 +4,30 @@ set -ex
 # x86_64-unknown-linux-musl
 docker build -t messense/rust-musl-cross:x86_64-musl-arm64 .
 # aarch64-unknown-linux-musl
-docker build --build-arg TARGET=aarch64-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-aarch64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:aarch64-musl-arm64 .
+docker build --build-arg TARGET=aarch64-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:aarch64-musl-arm64 .
 # arm-unknown-linux-musleabi
-docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabi-arm64 .
+docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabi-arm64 .
 # arm-unknown-linux-musleabihf
-docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabihf-arm64 .
+docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabihf-arm64 .
 # armv5te-unknown-linux-musleabi
-docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv5te-musleabi-arm64 .
+docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv5te-musleabi-arm64 .
 # armv7-unknown-linux-musleabihf
-docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabihf-arm64 .
+docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabihf-arm64 .
 # armv7-unknown-linux-musleabi
-docker build --build-arg TARGET=armv7-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabi-arm64 .
+docker build --build-arg TARGET=armv7-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabi-arm64 .
 # i686-unknown-linux-musl
-docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-elf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i686-musl-arm64 .
+docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i686-musl-arm64 .
 # i586-unknown-linux-musl
-docker build --build-arg TARGET=i586-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-elf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i586-musl-arm64 .
+docker build --build-arg TARGET=i586-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i586-musl-arm64 .
 # mips-unknown-linux-musl
-docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mips-musl-arm64 .
+docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mips-musl-arm64 .
 # mipsel-unknown-linux-musl
-docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mipsel-musl-arm64 .
+docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mipsel-musl-arm64 .
 # mips64-unknown-linux-muslabi64
-docker build --build-arg TARGET=mips64-unknown-linux-muslabi64 --build-arg OPENSSL_ARCH=linux64-mips64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64-muslabi64-arm64 .
+docker build --build-arg TARGET=mips64-unknown-linux-muslabi64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64-muslabi64-arm64 .
 # mips64el-unknown-linux-muslabi64
-docker build --build-arg TARGET=mips64el-unknown-linux-muslabi64 --build-arg OPENSSL_ARCH=linux64-mips64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64el-muslabi64-arm64 .
+docker build --build-arg TARGET=mips64el-unknown-linux-muslabi64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64el-muslabi64-arm64 .
 # powerpc64le-unknown-linux-musl
-docker build --build-arg TARGET=powerpc64le-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-ppc64le --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:powerpc64le-musl-arm64 .
+docker build --build-arg TARGET=powerpc64le-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:powerpc64le-musl-arm64 .
 # s390x-unknown-linux-musl
-docker build --build-arg TARGET=s390x-unknown-linux-musl --build-arg OPENSSL_ARCH=linux64-s390x --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:s390x-musl-arm64 .
+# docker build --build-arg TARGET=s390x-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:s390x-musl-arm64 .
diff --git a/build.sh b/build.sh
index d845db9..3cb8e04 100755
--- a/build.sh
+++ b/build.sh
@@ -4,30 +4,30 @@ set -ex
 # x86_64-unknown-linux-musl
 docker build -t messense/rust-musl-cross:x86_64-musl .
 # aarch64-unknown-linux-musl
-docker build --build-arg TARGET=aarch64-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-aarch64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:aarch64-musl .
+docker build --build-arg TARGET=aarch64-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:aarch64-musl .
 # arm-unknown-linux-musleabi
-docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabi .
+docker build --build-arg TARGET=arm-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabi .
 # arm-unknown-linux-musleabihf
-docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabihf .
+docker build --build-arg TARGET=arm-unknown-linux-musleabihf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:arm-musleabihf .
 # armv5te-unknown-linux-musleabi
-docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv5te-musleabi .
+docker build --build-arg TARGET=armv5te-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv5te-musleabi .
 # armv7-unknown-linux-musleabihf
-docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabihf .
+docker build --build-arg TARGET=armv7-unknown-linux-musleabihf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabihf .
 # armv7-unknown-linux-musleabi
-docker build --build-arg TARGET=armv7-unknown-linux-musleabi --build-arg OPENSSL_ARCH=linux-armv4 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabi .
+docker build --build-arg TARGET=armv7-unknown-linux-musleabi --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:armv7-musleabi .
 # i686-unknown-linux-musl
-docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-elf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i686-musl .
+docker build --build-arg TARGET=i686-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i686-musl .
 # i586-unknown-linux-musl
-docker build --build-arg TARGET=i586-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-elf --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i586-musl .
+docker build --build-arg TARGET=i586-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:i586-musl .
 # mips-unknown-linux-musl
-docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mips-musl .
+docker build --build-arg TARGET=mips-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mips-musl .
 # mipsel-unknown-linux-musl
-docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-mips32 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mipsel-musl .
+docker build --build-arg TARGET=mipsel-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak.32 -t messense/rust-musl-cross:mipsel-musl .
 # mips64-unknown-linux-muslabi64
-docker build --build-arg TARGET=mips64-unknown-linux-muslabi64 --build-arg OPENSSL_ARCH=linux64-mips64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64-muslabi64 .
+docker build --build-arg TARGET=mips64-unknown-linux-muslabi64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64-muslabi64 .
 # mips64el-unknown-linux-muslabi64
-docker build --build-arg TARGET=mips64el-unknown-linux-muslabi64 --build-arg OPENSSL_ARCH=linux64-mips64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64el-muslabi64 .
+docker build --build-arg TARGET=mips64el-unknown-linux-muslabi64 --build-arg RUST_MUSL_MAKE_CONFIG=config.mak -t messense/rust-musl-cross:mips64el-muslabi64 .
 # powerpc64le-unknown-linux-musl
-docker build --build-arg TARGET=powerpc64le-unknown-linux-musl --build-arg OPENSSL_ARCH=linux-ppc64le --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:powerpc64le-musl .
+docker build --build-arg TARGET=powerpc64le-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:powerpc64le-musl .
 # s390x-unknown-linux-musl
-docker build --build-arg TARGET=s390x-unknown-linux-musl --build-arg OPENSSL_ARCH=linux64-s390x --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:s390x-musl .
+# docker build --build-arg TARGET=s390x-unknown-linux-musl --build-arg RUST_MUSL_MAKE_CONFIG=config.mak --build-arg TOOLCHAIN=nightly -t messense/rust-musl-cross:s390x-musl .


Test patch:
diff --git a/tests/Cargo.lock b/tests/Cargo.lock
index a5ad267..9fa75e5 100644
--- a/tests/Cargo.lock
+++ b/tests/Cargo.lock
@@ -1,10 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a"
+checksum = "e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a"
 dependencies = [
  "gimli",
 ]
@@ -43,9 +45,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.59"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744"
+checksum = "b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282"
 dependencies = [
  "addr2line",
  "cc",
@@ -70,9 +72,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "bumpalo"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "bytes"
@@ -82,9 +84,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
 
 [[package]]
 name = "cc"
-version = "1.0.67"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
 
 [[package]]
 name = "cfg-if"
@@ -119,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
 dependencies = [
  "atty",
  "humantime",
@@ -222,9 +224,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
+checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if",
  "libc",
@@ -264,9 +266,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -301,9 +303,9 @@ checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68"
 
 [[package]]
 name = "httpdate"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9"
+checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "humantime"
@@ -313,9 +315,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54"
+checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -327,7 +329,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project",
+ "pin-project-lite",
  "socket2",
  "tokio",
  "tower-service",
@@ -371,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
+checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itoa"
@@ -398,9 +400,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.94"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
 
 [[package]]
 name = "log"
@@ -441,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
+checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
  "libc",
  "log",
@@ -500,21 +502,24 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.24.0"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
+checksum = "a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "once_cell"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "openssl"
-version = "0.10.34"
+version = "0.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
+checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -526,19 +531,28 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
+
+[[package]]
+name = "openssl-src"
+version = "111.15.0+1.1.1k"
+source = "git+https://github.com/alexcrichton/openssl-src-rs.git#9b1da591f7056a486cc3c2947ae09c813aabfa7d"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.63"
+version = "0.9.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
+checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
 dependencies = [
  "autocfg",
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -549,31 +563,11 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "pin-project"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -595,9 +589,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
 dependencies = [
  "unicode-xid",
 ]
@@ -613,9 +607,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
  "rand_chacha",
@@ -625,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "rand_chacha"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
  "rand_core",
@@ -635,27 +629,27 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
  "rand_core",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
 dependencies = [
  "bitflags",
 ]
@@ -688,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124"
+checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
 dependencies = [
  "base64",
  "bytes",
@@ -722,9 +716,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce"
+checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49"
 
 [[package]]
 name = "ryu"
@@ -744,9 +738,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
+checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -757,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
+checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -767,9 +761,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.125"
+version = "1.0.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
 
 [[package]]
 name = "serde_json"
@@ -812,9 +806,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.72"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
+checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -850,7 +844,6 @@ version = "0.1.0"
 dependencies = [
  "env_logger",
  "error-chain",
- "openssl-probe",
  "reqwest",
 ]
 
@@ -871,9 +864,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.5.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
+checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2"
 dependencies = [
  "autocfg",
  "bytes",
@@ -882,6 +875,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
+ "winapi",
 ]
 
 [[package]]
@@ -896,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
+checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
 dependencies = [
  "bytes",
  "futures-core",
@@ -951,9 +945,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
@@ -978,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "vcpkg"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 8437496..7663569 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -6,5 +6,7 @@ version = "0.1.0"
 [dependencies]
 env_logger = "0.8"
 error-chain = "0.12"
-openssl-probe = "0.1"
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.11", features = ["blocking", "native-tls-vendored"] }
+
+[patch.crates-io]
+openssl-src = { git = "https://github.com/alexcrichton/openssl-src-rs.git" }
diff --git a/tests/src/main.rs b/tests/src/main.rs
index 774a589..8ee3602 100644
--- a/tests/src/main.rs
+++ b/tests/src/main.rs
@@ -6,7 +6,6 @@ extern crate reqwest;
 extern crate env_logger;
 #[macro_use]
 extern crate error_chain;
-extern crate openssl_probe;
 
 error_chain! {
     foreign_links {
@@ -17,7 +16,6 @@ error_chain! {
 
 fn run() -> Result<()> {
     env_logger::init();
-    openssl_probe::init_ssl_cert_env_vars();
 
     println!("GET https://www.rust-lang.org");