Remove unused app_data field from EVP_CIPHER struct (#169)

awslabs · Dec 19, 2024 · 35d475d · 35d475d
1 parent b37d482
commit 35d475d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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