add default tls

basetenlabs · Jan 18, 2025 · 8fc7b6b · 8fc7b6b
1 parent 325abba
commit 8fc7b6b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 67 deletions.
diff --git a/.github/workflows/truss-transfer-build-maturin.yaml b/.github/workflows/truss-transfer-build-maturin.yaml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-      - name: Build wheels (non-aarch64)
+      - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           working-directory: truss-transfer

diff --git a/truss-transfer/Cargo.lock b/truss-transfer/Cargo.lock
diff --git a/truss-transfer/Cargo.toml b/truss-transfer/Cargo.toml
@@ -16,19 +16,17 @@ pyo3 = { version = "0.23.4", features = ["extension-module", "abi3-py38"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 tokio = { version = "1.24", features = ["rt-multi-thread", "macros", "fs"] }
-# Avoid openssl, to improve portability
-# openssl = { version = "0.10", features = ["vendored"] }
 
-# Default for non-aarch64 targets
+# Default reqwest dependency with rustls for portability
 reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "stream", "rustls-tls"] }
 
-[target.'cfg(target_arch = "aarch64")'.dependencies]
-# https://github.com/briansmith/ring/issues/1789
-reqwest = { version = "0.12", features = ["blocking", "json", "stream"] }
+# Use OpenSSL for all ARM-based architectures
+[target.'cfg(any(target_arch = "aarch64", target_arch = "arm"))'.dependencies]
+reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "stream", "default-tls"] }
 openssl = { version = "0.10", features = ["vendored"] }
 
 [features]
-cli = [] # For the CLI
+cli = []  # For the CLI
 
 [[bin]]
 name = "truss_transfer_cli"