Flip submodule back to aws-lc main (#150)

awslabs · May 21, 2024 · a48d3d9 · a48d3d9
1 parent 0ff601e
commit a48d3d9
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
-	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
+1 −1		.github/workflows/abidiff.yml
+8 −1		.github/workflows/actions-ci.yml
+1 −1		.github/workflows/aws-lc-rs.yml
+2 −1		.github/workflows/cmake.yml
+8 −4		.github/workflows/codecov-ci.yml
+1 −1		.github/workflows/cross-test.yml
+1 −1		.github/workflows/integrations.yml
+80 −2		.github/workflows/windows-alt.yml
+27 −14		CMakeLists.txt
+16 −0		cmake/go.cmake
+46 −0		crypto/bio/bio.c
+42 −10		crypto/bio/bio_test.cc
+1 −0		crypto/crypto_test.cc
+27 −8		crypto/fipsmodule/cpucap/cpu_intel.c
+57 −0		crypto/fipsmodule/cpucap/cpu_ppc64le.c
+14 −13		crypto/fipsmodule/ec/ec_nistp.c
+6 −7		crypto/fipsmodule/ec/ec_nistp.h
+1 −1		crypto/fipsmodule/ec/p256.c
+2 −2		crypto/fipsmodule/ec/p384.c
+2 −2		crypto/fipsmodule/ec/p521.c
+2 −2		crypto/fipsmodule/service_indicator/service_indicator_test.cc
+7 −5		crypto/kyber/pqcrystals_kyber_ref_common/indcpa.c
+4 −3		crypto/kyber/pqcrystals_kyber_ref_common/indcpa.h
+65 −13		crypto/kyber/pqcrystals_kyber_ref_common/kem.c
+6 −0		crypto/kyber/pqcrystals_kyber_ref_common/kem.h
+6 −0		crypto/test/test_util.cc
+8 −0		crypto/test/test_util.h
+1 −0		crypto/x509/internal.h
+39 −21		crypto/x509/name_print.c
+24 −0		crypto/x509/x509_lu.c
+61 −24		crypto/x509/x509_test.cc
+1 −0		go.mod
+1 −1		include/openssl/base.h
+16 −1		include/openssl/bio.h
+52 −10		include/openssl/ssl.h
+30 −5		include/openssl/x509.h
+18 −0		ssl/internal.h
+26 −10		ssl/ssl_buffer.cc
+66 −9		ssl/ssl_lib.cc
+96 −37		ssl/ssl_test.cc
+5 −0		ssl/test/bssl_shim.cc
+3 −0		ssl/test/runner/common.go
+5 −0		ssl/test/runner/conn.go
+32 −0		ssl/test/runner/runner.go
+2 −0		ssl/test/runner/ssl_transfer/test_case_names.txt
+2 −0		ssl/test/test_config.cc
+2 −0		ssl/test/test_config.h
+2 −2		tests/ci/cdk/cdk/codebuild/github_ci_integration_omnibus.yaml
+16 −0		tests/ci/integration/mysql_patch/pending_size_t.patch
+7 −7		tests/ci/integration/mysql_patch/test_wl13075-off.patch
+10 −12		tests/ci/integration/run_mysql_integration.sh
+2 −1		tests/ci/integration/run_ntp_integration.sh
+28 −32		tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch
+79 −0		tests/ci/run_cross_mingw_tests.sh
+1 −0		tests/ci/run_cross_tests.sh
+2 −2		util/codecov-ci.sh