Flip back src submdule to point to aws-lc main (#154)

awslabs · Jun 12, 2024 · 7d839cf · 7d839cf
1 parent 8b4c234
commit 7d839cf
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 = ec_nistp_refactor-v2
-	url = https://github.com/dkostic/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
+45 −9		.github/workflows/actions-ci.yml
+15 −1		.github/workflows/integrations.yml
+1 −1		.github/workflows/windows-alt.yml
+1 −0		.gitignore
+3 −2		CMakeLists.txt
+2 −0		crypto/CMakeLists.txt
+8 −35		crypto/chacha/asm/chacha-armv4.pl
+8 −25		crypto/chacha/asm/chacha-armv8.pl
+16 −1		crypto/chacha/chacha.c
+24 −5		crypto/chacha/chacha_test.cc
+26 −3		crypto/chacha/internal.h
+8 −8		crypto/fipsmodule/hmac/hmac.c
+1 −1		crypto/fipsmodule/modes/gcm_test.cc
+2 −2		crypto/fipsmodule/service_indicator/service_indicator_test.cc
+1 −0		crypto/kyber/README.md
+13 −3		crypto/kyber/pqcrystals_kyber_ref_common/poly.c
+1 −1		crypto/mem.c
+1 −0		crypto/ml_kem/README.md
+13 −3		crypto/ml_kem/ml_kem_ipd_ref_common/poly.c
+4 −10		crypto/x509/internal.h
+1 −3		crypto/x509/t_req.c
+1 −2		crypto/x509/t_x509.c
+5 −3		crypto/x509/v3_purp.c
+19 −26		crypto/x509/x509_cmp.c
+0 −21		crypto/x509/x509_lu.c
+23 −20		crypto/x509/x509_req.c
+404 −133		crypto/x509/x509_test.cc
+36 −61		crypto/x509/x509_vfy.c
+1 −1		crypto/x509/x509spki.c
+44 −64		crypto/x509/x_pubkey.c
+6 −22		generated-src/ios-aarch64/crypto/chacha/chacha-armv8.S
+8 −38		generated-src/ios-arm/crypto/chacha/chacha-armv4.S
+10 −26		generated-src/linux-aarch64/crypto/chacha/chacha-armv8.S
+10 −36		generated-src/linux-arm/crypto/chacha/chacha-armv4.S
+7 −23		generated-src/win-aarch64/crypto/chacha/chacha-armv8.S
+1 −1		include/openssl/base.h
+27 −29		include/openssl/ssl.h
+35 −40		include/openssl/x509.h
+9 −1		ssl/ssl_cipher.cc
+16 −0		ssl/ssl_test.cc
+7 −6		ssl/ssl_x509.cc
+4 −4		tests/ci/cdk/cdk/codebuild/ec2_test_framework_omnibus.yaml
+262 −0		tests/ci/integration/python_patch/3.13/aws-lc-cpython.patch
+74 −0		tests/ci/integration/python_tests/test_crt.py
+21 −0		tests/ci/integration/python_tests/test_cryptography.py
+17 −0		tests/ci/integration/python_tests/test_pyopenssl.py
+92 −5		tests/ci/integration/run_python_integration.sh
+19 −0		util/build_compilation_database.sh