Flip back submodule src (#121)

awslabs · Oct 11, 2023 · dcc1786 · dcc1786
1 parent 70e3732
commit dcc1786
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-2023-10-02
-	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
+3 −1		.gitignore
+27 −0		crypto/bio/bio_test.cc
+4 −10		crypto/bio/connect.c
+11 −1		crypto/blake2/blake2.c
+7 −0		crypto/digest_extra/digest_extra.c
+97 −41		crypto/digest_extra/digest_test.cc
+3 −16		crypto/ec_extra/hash_to_curve.c
+60 −0		crypto/endian_test.cc
+4 −0		crypto/evp_extra/evp_test.cc
+2 −2		crypto/fipsmodule/CMakeLists.txt
+53 −29		crypto/fipsmodule/bn/bytes.c
+23 −6		crypto/fipsmodule/bn/internal.h
+29 −6		crypto/fipsmodule/digest/digest.c
+65 −0		crypto/fipsmodule/digest/digests.c
+4 −0		crypto/fipsmodule/digest/internal.h
+4 −5		crypto/fipsmodule/ec/ec_test.cc
+26 −7		crypto/fipsmodule/ec/p384.c
+14 −4		crypto/fipsmodule/ec/p521.c
+152 −1		crypto/fipsmodule/service_indicator/service_indicator_test.cc
+8 −0		crypto/fipsmodule/sha/internal.h
+37 −15		crypto/fipsmodule/sha/sha3.c
+16 −19		crypto/fipsmodule/sha/sha3_test.cc
+2 −2		crypto/fipsmodule/sshkdf/sshkdf.c
+33 −6		crypto/obj/obj_dat.h
+3 −1		crypto/obj/obj_mac.num
+2 −0		crypto/obj/objects.txt
+6 −7		include/openssl/bio.h
+8 −6		include/openssl/digest.h
+11 −1		include/openssl/nid.h
+15 −0		include/openssl/ssl.h
+4 −4		tests/ci/cdk/app.py
+15 −11		tests/ci/cdk/cdk/aws_lc_ec2_test_framework_ci_stack.py
+31 −0		tests/ci/cdk/cdk/codebuild/ec2_test_framework_omnibus.yaml
+0 −16		tests/ci/cdk/cdk/codebuild/github_ci_macos_m1_omnibus.yaml
+43 −0		tests/ci/cdk/cdk/ssm/general_test_run_ssm_document.yaml
+2 −2		tests/ci/cdk/cdk/ssm/m1_tests_ssm_document.yaml
+13 −0		tests/ci/codebuild/common/run_ec2_target.yml
+135 −0		tests/ci/run_ec2_test_framework.sh
+2 −2		tests/ci/run_m1_ec2_instance.sh
+4 −0		util/fipstools/acvp/ACVP.md
+24 −9		util/fipstools/acvp/acvptool/subprocess/hash.go
+3 −4		util/fipstools/acvp/acvptool/subprocess/rsa.go
+14 −11		util/fipstools/acvp/acvptool/subprocess/subprocess.go
+ −		util/fipstools/acvp/acvptool/test/expected/SHAKE-128.bz2
+ −		util/fipstools/acvp/acvptool/test/expected/SHAKE-256.bz2
+1 −0		util/fipstools/acvp/acvptool/test/sha-tests/shake-128-tests.json
+1 −0		util/fipstools/acvp/acvptool/test/sha-tests/shake-256-tests.json
+ −		util/fipstools/acvp/acvptool/test/vectors/SHAKE-128.bz2
+ −		util/fipstools/acvp/acvptool/test/vectors/SHAKE-256.bz2
+77 −1		util/fipstools/acvp/modulewrapper/modulewrapper.cc
+13 −4		util/fipstools/inject_hash/inject_hash.go