Try non-vendored OpenSSL

trailofbits · Oct 16, 2024 · bb8346a · bb8346a
1 parent dd4275b
commit bb8346a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -44,14 +44,10 @@ jobs:
             if command -v yum 2>&1 >/dev/null
             then
               yum update
-              yum install -y perl-core cpanminus devtoolset-10-libatomic-devel
-              # Workaround for OpenSSL not building on Centos 7 (manylinux2014)
-              # Remove once `openssl-src` builds OpenSSL > 3.3.2 by default
-              # Ref: https://github.com/openssl/openssl/pull/25367#issuecomment-2327177830
-              cpanm --verbose --notest install Sub::Util
-            # else
-            #   apt update
-            #   apt install -y perl-core
+              yum install -y openssl-devel
+            else
+              apt update
+              apt install -y libssl-dev
             fi
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -92,15 +88,26 @@ jobs:
       matrix:
         platform:
           - runner: windows-latest
+            arch: 64
             target: x64
           - runner: windows-latest
+            arch: 86
             target: x86
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
           architecture: ${{ matrix.platform.target }}
+      - name: Install OpenSSL
+        env:
+          OPENSSL_INSTALLER: "Win${{ matrix.platform.arch }}OpenSSL-1_1_1w.exe"
+          OPENSSL_PATH: "C:\\OpenSSL-1-1-Win${{ matrix.platform.arch }}"
+        run: |
+          curl.exe -o "c:\\$env:OPENSSL_INSTALLER" -fsSL "https://slproweb.com/download/$env:OPENSSL_INSTALLER"
+          Start-Process -FilePath "c:\\$env:OPENSSL_INSTALLER" -ArgumentList "/silent /verysilent /DIR=$env:OPENSSL_PATH" -NoNewWindow -Wait
+          echo "Installed OpenSSL version:"
+          Start-Process -FilePath "$env:OPENSSL_PATH\\bin\\openssl.exe" -ArgumentList "version" -Wait -NoNewWindow
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -21,7 +21,7 @@ hex = "0.4"
 sha2 = "0.10.8"
 rand = "0.8.5"
 cryptography-x509 = { git = "https://github.com/pyca/cryptography.git"}
-openssl = { version = "0.10.66", features = ["vendored"] }
+openssl = { version = "0.10.66" }
 
 [features]
 extension-module = ["pyo3/extension-module"]