switch from fork to upstream aws-lc

corretto · Aug 23, 2024 · 97e7b7f · 97e7b7f
1 parent 30a7287
commit 97e7b7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "aws-lc"]
 	path = aws-lc
-	url = https://github.com/sgmenda-aws/aws-lc
-	branch = experimental-pq-hybrid-with-hpke
+	url = https://github.com/aws/aws-lc
+	branch = experimental-pq-hybrid
diff --git a/aws-lc b/aws-lc
diff --git a/build.gradle b/build.gradle
@@ -12,15 +12,13 @@ plugins {
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
-ext.experimentalPqHybrid = true
-
 group = 'software.amazon.cryptools'
 version = '2.4.1'
 ext.isFips = Boolean.getBoolean('FIPS')
 if (ext.isFips) {
     ext.awsLcGitVersionId = 'AWS-LC-FIPS-2.0.13'
 } else {
-    ext.awsLcGitVersionId = 'v1.30.1'
+    ext.awsLcGitVersionId = '72c276e9c709a2d9b94e41b06da6abf2b3805a4a'
 }
 
 // Check for user inputted git version ID.
@@ -194,7 +192,7 @@ task buildAwsLc {
             }
         }
 
-        if (!isLegacyBuild && !experimentalPqHybrid) {
+        if (!isLegacyBuild) {
             exec {
                 workingDir awslcSrcPath
                 commandLine "git", "fetch", "--tags"
+112 −93		crypto/hpke/hpke.c
+21 −10		crypto/hpke/hpke_test.cc
+40 −40		generated-src/crypto_test_data.cc
+5 −4		include/openssl/hpke.h
+1 −1		tool/speed.cc