feat(download/rustls): use aws-lc instead of ring

rust-lang · Aug 1, 2024 · 8fdc613 · 8fdc613
1 parent 796be02
commit 8fdc613
Show file tree

Hide file tree

Showing 20 changed files with 302 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -62,6 +62,11 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
+      - name: Install NASM
+        # Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
+        # See: https://aws.github.io/aws-lc-rs/requirements/windows.html
+        uses: ilammy/setup-nasm@v1
+        if: matrix.mingwdir == ''
       - name: Install mingw
         uses: bwoodsend/setup-winlibs-action@v1
         if: matrix.mingwdir != ''
@@ -220,6 +225,11 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
+      - name: Install NASM
+        # Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
+        # See: https://aws.github.io/aws-lc-rs/requirements/windows.html
+        uses: ilammy/setup-nasm@v1
+        if: matrix.mingwdir == ''
       - name: Install mingw
         uses: bwoodsend/setup-winlibs-action@v1
         if: matrix.mingwdir != ''
@@ -384,6 +394,11 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
+      - name: Install NASM
+        # Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
+        # See: https://aws.github.io/aws-lc-rs/requirements/windows.html
+        uses: ilammy/setup-nasm@v1
+        if: matrix.mingwdir == ''
       - name: Install mingw
         uses: bwoodsend/setup-winlibs-action@v1
         if: matrix.mingwdir != ''
@@ -1447,6 +1462,11 @@ jobs:
           echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
           echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
           echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
+      - name: Install NASM
+        # Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
+        # See: https://aws.github.io/aws-lc-rs/requirements/windows.html
+        uses: ilammy/setup-nasm@v1
+        if: ${{ contains(matrix.os, 'windows') }}
       - name: Set environment variables appropriately for the build
         shell: bash
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/actions-templates/all-features-template.yaml b/ci/actions-templates/all-features-template.yaml
@@ -38,6 +38,11 @@ jobs: # skip-all
           echo "OPENSSL_LIB_DIR=C:/Program Files/OpenSSL/lib" >> $env:GITHUB_ENV
           echo "OPENSSL_DIR=C:/Program Files/OpenSSL/" >> $env:GITHUB_ENV
           echo "OPENSSL_INCLUDE_DIR=C:/Program Files/OpenSSL/include" >> $env:GITHUB_ENV
+      - name: Install NASM
+        # Building `aws-lc-rs` for Windows MSVC depends on `NASM`.
+        # See: https://aws.github.io/aws-lc-rs/requirements/windows.html
+        uses: ilammy/setup-nasm@v1
+        if: ${{ contains(matrix.os, 'windows') }}
       - name: Set environment variables appropriately for the build
         shell: bash
         run: |