Merge pull request eqlabs#2210 from eqlabs/krisztian/use-rustls

feat: use rustls instead of native-tls

Cargo.toml

@@ -106,7 +106,11 @@ r2d2_sqlite = "0.25.0"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 rayon = "1.8.0"
-reqwest = "0.12.5"
+reqwest = { version = "0.12.5", default-features = false, features = [
+    "http2",
+    "rustls-tls-native-roots",
+    "charset",
+] }
 rstest = "0.18.2"
 rusqlite = "0.32.1"
 semver = "1.0.18"

build/cargo-build.sh

@@ -5,8 +5,6 @@ elif [[ "${TARGETARCH}" == "arm64" ]]; then
     PKG_CONFIG_ALLOW_CROSS=1 \
     RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -L/usr/aarch64-linux-gnu/lib -L/build/sysroot/usr/lib/aarch64-linux-gnu" \
     C_INCLUDE_PATH=/build/sysroot/usr/include \
-    OPENSSL_LIB_DIR=/build/sysroot/usr/lib/aarch64-linux-gnu \
-    OPENSSL_INCLUDE_DIR=/build/sysroot/usr/include/aarch64-linux-gnu \
     JEMALLOC_SYS_WITH_LG_PAGE=16 \
     cargo build --target aarch64-unknown-linux-gnu $*
 fi

build/cargo-chef-cook.sh

@@ -5,8 +5,6 @@ elif [[ "${TARGETARCH}" == "arm64" ]]; then
     PKG_CONFIG_ALLOW_CROSS=1 \
     RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -L/usr/aarch64-linux-gnu/lib -L/build/sysroot/usr/lib/aarch64-linux-gnu" \
     C_INCLUDE_PATH=/build/sysroot/usr/include \
-    OPENSSL_LIB_DIR=/build/sysroot/usr/lib/aarch64-linux-gnu \
-    OPENSSL_INCLUDE_DIR=/build/sysroot/usr/include/aarch64-linux-gnu \
     JEMALLOC_SYS_WITH_LG_PAGE=16 \
     cargo chef cook --target aarch64-unknown-linux-gnu $*
 fi

build/prepare.sh

@@ -1,15 +1,13 @@
 #!/bin/bash -e
 if [[ "${TARGETARCH}" == "amd64" ]]; then
     apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libssl-dev libzstd-dev protobuf-compiler make
+    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libzstd-dev protobuf-compiler make
 elif [[ "${TARGETARCH}" == "arm64" ]]; then
     echo "deb [arch=arm64] http://deb.debian.org/debian bookworm main" >>/etc/apt/sources.list
     apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libssl-dev libzstd-dev protobuf-compiler gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross make
-    apt-get download libssl-dev:arm64 libssl3:arm64 libzstd-dev:arm64
+    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libzstd-dev protobuf-compiler gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross make
+    apt-get download libzstd-dev:arm64
     mkdir -p /build/sysroot
-    dpkg -x libssl-dev_*.deb /build/sysroot/
-    dpkg -x libssl3_*.deb /build/sysroot/
     dpkg -x libzstd-dev_*.deb /build/sysroot/
     rustup target add aarch64-unknown-linux-gnu
 fi