Flip back submodule (#170)

awslabs · Dec 20, 2024 · 0fcf587 · 0fcf587
1 parent 35d475d
commit 0fcf587
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "src"]
 	path = src
-	branch = upstream-merge-2024-12-13
-	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

diff --git a/src b/src
+2 −1		crypto/dilithium/pqcrystals_dilithium_ref_common/sign.c
+10 −0		crypto/pkcs7/pkcs7_asn1.c
+11 −0		crypto/pkcs7/pkcs7_test.cc
+12 −0		include/openssl/bn.h
+5 −0		include/openssl/pkcs7.h
+2 −2		tests/ci/run_posix_sanitizers.sh
+14 −14		tests/ci/run_posix_tests.sh