Merge pull request #1165 from pq-code-package/remove_awslc_patch

AWS-LC: Remove patch

Author: hanno-becker

.github/workflows/all.yml

@@ -52,14 +52,14 @@ jobs:
     uses: ./.github/workflows/integration-liboqs.yml
     secrets: inherit
   awslc_integration_fixed:
-    name: AWS-LC (8568a08)
+    name: AWS-LC (873ca6f2)
     permissions:
       contents: 'read'
       id-token: 'write'
     needs: [ base ]
     uses: ./.github/workflows/integration-awslc.yml
     with:
-      commit: bce1d2cbfd702f3bb6dcbc5ffd2da45bce08adcb # v1.56.0
+      commit: 873ca6f227e3ad2351325f921ee93760095b9ddf
     secrets: inherit
   awslc_integration_head:
     name: AWS-LC (HEAD)

.github/workflows/integration-awslc.yml

@@ -40,14 +40,22 @@ jobs:
         with:
           repository: ${{ inputs.repository }}
           commit: ${{ inputs.commit }}
+      - name: Apply pre-import patch if present
+        run: |
+          cd $AWSLC_DIR
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch
+          fi
       - name: Run importer
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
-      - name: Apply custom stdlib patch
+      - name: Apply post-import patch if present
         run: |
           cd $AWSLC_DIR
-          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/post_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/post_import.patch
+          fi
       - name: Build+Test AWS-LC (FIPS=${{ matrix.fips }})
         run: |
           cd $AWSLC_DIR
@@ -91,14 +99,22 @@ jobs:
         with:
           repository: ${{ inputs.repository }}
           commit: ${{ inputs.commit }}
+      - name: Apply pre-import patch if present
+        run: |
+          cd $AWSLC_DIR
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch
+          fi
       - name: Run importer
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
-      - name: Apply custom stdlib patch
+      - name: Apply post-import patch if present
         run: |
           cd $AWSLC_DIR
-          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/post_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/post_import.patch
+          fi
       - name: Run test
         run: |
           cd $AWSLC_DIR
@@ -127,14 +143,22 @@ jobs:
         with:
           repository: ${{ inputs.repository }}
           commit: ${{ inputs.commit }}
+      - name: Apply pre-import patch if present
+        run: |
+          cd $AWSLC_DIR
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/pre_import.patch
+          fi
       - name: Run importer
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
-      - name: Apply custom stdlib patch
+      - name: Apply post-import patch if present
         run: |
           cd $AWSLC_DIR
-          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
+          if [ -f "$GITHUB_WORKSPACE/integration/aws-lc/post_import.patch" ]; then
+            git apply $GITHUB_WORKSPACE/integration/aws-lc/post_import.patch
+          fi
       - name: Run test
         run: |
           cd $AWSLC_DIR

integration/aws-lc/add-custom-stdlib.patch

@@ -0,0 +1,35 @@
+-# Copyright (c) The mlkem-native project authors
+-# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
+---
+ crypto/fipsmodule/ml_kem/importer.sh | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/crypto/fipsmodule/ml_kem/importer.sh b/crypto/fipsmodule/ml_kem/importer.sh
+index e3d8650ce..24832abb7 100755
+--- a/crypto/fipsmodule/ml_kem/importer.sh
++++ b/crypto/fipsmodule/ml_kem/importer.sh
+@@ -115,15 +115,15 @@ else
+ fi
+
+ # Exclude POLY_COMPRESS/DECOMPRESS functions from the x86 backend for now.
+-sed ${SED_I[@]} '/compress_avx2.c/d' $SRC/mlkem_native_bcm.c
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_COMPRESS_D4/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_COMPRESS_D5/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_COMPRESS_D10/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_COMPRESS_D11/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_DECOMPRESS_D4/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_DECOMPRESS_D5/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_DECOMPRESS_D10/d' $SRC/native/x86_64/meta.h
+-sed ${SED_I[@]} '/MLK_USE_NATIVE_POLY_DECOMPRESS_D11/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/compress_avx2.c/d' $SRC/mlkem_native_bcm.c
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_COMPRESS_D4/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_COMPRESS_D5/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_COMPRESS_D10/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_COMPRESS_D11/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_DECOMPRESS_D4/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_DECOMPRESS_D5/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_DECOMPRESS_D10/d' $SRC/native/x86_64/meta.h
++sed "${SED_I[@]}" '/MLK_USE_NATIVE_POLY_DECOMPRESS_D11/d' $SRC/native/x86_64/meta.h
+
+ # Copy mlkem-native header
+ # This is only needed for access to the various macros defining key sizes.