Merge remote-tracking branch 'upstream/master' into p384_validate_2

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "src"]
 	path = src
-	branch = evp-pkey-hmac
-	url = https://github.com/samuel40791765/aws-lc.git
+	branch = main
+	url = https://github.com/aws/aws-lc.git
 [submodule "cryptol-specs"]
 	path = cryptol-specs
 	branch = sha-imperative

SAW/patch/noinline-OPENSSL_malloc.patch

@@ -0,0 +1,12 @@
+diff --git a/crypto/mem.c b/crypto/mem.c
+index 7e58609c0..b92a0e555 100644
+--- a/crypto/mem.c
++++ b/crypto/mem.c
+@@ -187,6 +187,7 @@ static const uint8_t kBoringSSLBinaryTag[18] = {
+     0,
+ };
+
++__attribute__((noinline))
+ void *OPENSSL_malloc(size_t size) {
+   if (malloc_impl != NULL) {
+     assert(OPENSSL_memory_alloc == NULL);

SAW/scripts/x86_64/entrypoint_check.sh

@@ -35,6 +35,7 @@ extract-bc build/llvm_x86/crypto/crypto_test
 apply_patch "rsa-encrypt"
 apply_patch "nomuxrsp"
 apply_patch "ec_GFp_nistp384_point_mul_public"
+apply_patch "noinline-OPENSSL_malloc"
 apply_patch "noinline-aes_gcm_from_cipher_ctx"
 apply_patch "noinline-bn_mod_add_words"
 apply_patch "noinline-bn_reduce_once_in_place"