CI: github: re-enable AWS-LC 3.x (fips-2024-09-27)

This reverts commit 9fc468fe5d90e155cd86ed6b51430fedc04e02bf.

The OPENSSL_memchr build fix for 3.x was backported in the branch so we
can re-enable the CI. https://github.com/aws/aws-lc/issues/3759.

diff --git a/.github/matrix.py b/.github/matrix.py
index 87e7faeba26761f66479b4dc50cf4d597ceb5fb3..5e90dcfd4d77758cb763532b2faa5142dd8d9f65 100755 (executable)
--- a/.github/matrix.py
+++ b/.github/matrix.py
@@ -272,8 +272,7 @@ def main(ref_name):
             "OPENSSL_VERSION=1.1.1s",
             "OPENSSL_VERSION=3.5.1",
             "QUICTLS_VERSION=OpenSSL_1_1_1w-quic1",
-            # disabled: aws-lc 3.x compile error, see https://github.com/aws/aws-lc/issues/3759
-            # "AWS_LC_VERSION=branch-fips-2024-09-27",
+            "AWS_LC_VERSION=branch-fips-2024-09-27",
             "AWS_LC_VERSION=branch-fips-2025-09-12-lts",
             # "BORINGSSL=yes",
         ]

diff --git a/.github/workflows/aws-lc-fips.yml b/.github/workflows/aws-lc-fips.yml
index 212c481e795d7d899ecb221e0965a9096d762390..8b31b04b7fadbc8b7f93787540f7d25cbcf9ec2b 100644 (file)
--- a/.github/workflows/aws-lc-fips.yml
+++ b/.github/workflows/aws-lc-fips.yml
@@ -15,14 +15,14 @@ jobs:
     strategy:
       matrix:
         include:
-          # disabled: aws-lc 3.x compile error, see https://github.com/aws/aws-lc/issues/3759
-          # - name: AWS-LC 3.x (FIPS)
-          #   ssl: AWS_LC_VERSION=branch-fips-2024-09-27
-          #   # Shared by runs-on and the cache key for all three jobs.
-          #   os: &runner ubuntu-latest
+          # Same AWS-LC sources as in the VTest job, built in FIPS mode
+          - name: AWS-LC 3.x (FIPS)
+            ssl: AWS_LC_VERSION=branch-fips-2024-09-27
+            # Shared by runs-on and the cache key for all three jobs.
+            os: &runner ubuntu-latest
           - name: AWS-LC 4.x (FIPS)
             ssl: AWS_LC_VERSION=branch-fips-2025-09-12-lts
-            os: &runner ubuntu-latest
+            os: *runner
           - name: AWS-LC latest (FIPS)
             ssl: AWS_LC_VERSION=latest
             os: *runner