From 35d475d88f709cae6a9f83a2242cc9582d9e2efc Mon Sep 17 00:00:00 2001
From: Yan Peng <112029182+pennyannn@users.noreply.github.com>
Date: Thu, 19 Dec 2024 13:26:01 -0800
Subject: [PATCH] Remove unused app_data field from EVP_CIPHER struct (#169)

---
 .gitmodules               |  4 ++--
 SAW/proof/AES/AES-GCM.saw | 10 +++++-----
 src                       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 772e2da7..f24936c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "src"]
 	path = src
-	branch = main
-	url = https://github.com/aws/aws-lc.git
+	branch = upstream-merge-2024-12-13
+	url = https://github.com/samuel40791765/aws-lc.git
 [submodule "cryptol-specs"]
 	path = cryptol-specs
 	branch = sha-imperative
diff --git a/SAW/proof/AES/AES-GCM.saw b/SAW/proof/AES/AES-GCM.saw
index 61a2f239..20f39b90 100644
--- a/SAW/proof/AES/AES-GCM.saw
+++ b/SAW/proof/AES/AES-GCM.saw
@@ -131,11 +131,11 @@ let points_to_evp_cipher_st ptr = do {
                            EVP_CIPH_FLAG_CUSTOM_CIPHER + EVP_CIPH_ALWAYS_CALL_INIT +
                            EVP_CIPH_CTRL_INIT + EVP_CIPH_FLAG_AEAD_CIPHER |};
   crucible_points_to (crucible_elem ptr 5) (crucible_term {{ `flags : [32] }});
-  crucible_points_to (crucible_elem ptr 6) crucible_null;
-  crucible_points_to (crucible_elem ptr 7) (crucible_global "aes_gcm_init_key");
-  crucible_points_to (crucible_elem ptr 8) (crucible_global "aes_gcm_cipher");
-  crucible_points_to (crucible_elem ptr 9) (crucible_global "aes_gcm_cleanup");
-  crucible_points_to (crucible_elem ptr 10) (crucible_global "aes_gcm_ctrl");
+  // crucible_points_to (crucible_elem ptr 6) crucible_null;
+  crucible_points_to (crucible_elem ptr 6) (crucible_global "aes_gcm_init_key");
+  crucible_points_to (crucible_elem ptr 7) (crucible_global "aes_gcm_cipher");
+  crucible_points_to (crucible_elem ptr 8) (crucible_global "aes_gcm_cleanup");
+  crucible_points_to (crucible_elem ptr 9) (crucible_global "aes_gcm_ctrl");
 };
 
 // Initialize the fields of an `EVP_CIPHER_CTX` struct to point to the same values as a
diff --git a/src b/src
index 85f58da2..dc1cc972 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 85f58da29e68906d094d378fe968f6b90807d05f
+Subproject commit dc1cc972c713d135a95bcbc5b4be8eb0f02d8e85