aws-lc: Use OPENSSL_memcpy and OPENSSL_memset

This commit adjusts the config file used by AWS-LC to leverage
the new customization mechanism for memset/memcpy to point to
OpenSSL's OPENSSL_memset/OPENSSL_memcpy versions of those function.
A patch is used to update the mlkem-native config used by AWS-LC;
this should be removed once AWS-LC has updated the config.

Signed-off-by: Hanno Becker <beckphan@amazon.co.uk>

Author: hanno-becker

.github/workflows/integration-awslc.yml

@@ -44,6 +44,10 @@ jobs:
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
+      - name: Apply custom stdlib patch
+        run: |
+          cd $AWSLC_DIR
+          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
       - name: Build+Test AWS-LC (FIPS=${{ matrix.fips }})
         run: |
           cd $AWSLC_DIR
@@ -91,6 +95,10 @@ jobs:
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
+      - name: Apply custom stdlib patch
+        run: |
+          cd $AWSLC_DIR
+          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
       - name: Run test
         run: |
           cd $AWSLC_DIR
@@ -123,6 +131,10 @@ jobs:
         run: |
           cd $AWSLC_DIR/crypto/fipsmodule/ml_kem
           GITHUB_REPOSITORY=$GITHUB_REPOSITORY GITHUB_SHA=$GITHUB_SHA ./importer.sh --force
+      - name: Apply custom stdlib patch
+        run: |
+          cd $AWSLC_DIR
+          patch -p0 < $GITHUB_WORKSPACE/integration/aws-lc/add-custom-stdlib.patch
       - name: Run test
         run: |
           cd $AWSLC_DIR

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

@@ -0,0 +1,31 @@
+# Copyright (c) The mlkem-native project authors
+# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
+--- crypto/fipsmodule/ml_kem/mlkem_native_config.h
++++ crypto/fipsmodule/ml_kem/mlkem_native_config.h
+@@ -64,6 +64,26 @@
+ }
+ #endif // !__ASSEMBLER__
+ 
++// Map memcpy function to the one used by AWS-LC
++#define MLK_CONFIG_CUSTOM_MEMCPY
++#if !defined(__ASSEMBLER__)
++#include <stdint.h>
++#include "mlkem/sys.h"
++static MLK_INLINE void *mlk_memcpy(void *dest, const void *src, size_t n) {
++    return OPENSSL_memcpy(dest, src, n);
++}
++#endif // !__ASSEMBLER__
++
++// Map memset function to the one used by AWS-LC
++#define MLK_CONFIG_CUSTOM_MEMSET
++#if !defined(__ASSEMBLER__)
++#include <stdint.h>
++#include "mlkem/sys.h"
++static MLK_INLINE void *mlk_memset(void *s, int c, size_t n) {
++    return OPENSSL_memset(s, c, n);
++}
++#endif // !__ASSEMBLER__
++
+ #if defined(OPENSSL_NO_ASM)
+ #define MLK_CONFIG_NO_ASM
+ #endif