Merge branch 'main' into cdk-update

justsmth · Jan 11, 2024 · 5fa9ed1 · 5fa9ed1
2 parents d4465d2 + e6e201b
commit 5fa9ed1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/abidiff.yml b/.github/workflows/abidiff.yml
@@ -1,4 +1,4 @@
-name: AWS-LC ABI Diff
+name: ABI Diff
 on:
   pull_request:
     branches: [ '*' ]

diff --git a/.github/workflows/actions-ci.yml b/.github/workflows/actions-ci.yml
@@ -1,4 +1,4 @@
-name: AWS-LC CI Tests
+name: General CI Tests
 on:
   pull_request:
     branches: [ '*' ]

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -1,4 +1,4 @@
-name: AWS-LC CMake Compatability
+name: CMake Compatability
 on:
   pull_request:
     branches: [ '*' ]
@@ -13,7 +13,7 @@ env:
   GOPROXY: https://proxy.golang.org,direct
 jobs:
   cmake:
-    name: CMake Version Build
+    name: CMake ${{ matrix.cmake.version}} build with ${{ matrix.generator}} FIPS=${{ matrix.fips }}
     strategy:
       matrix:
         cmake:

diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml
@@ -1,4 +1,4 @@
-name: aws-lc integration tests
+name: Integration tests
 on:
   push:
     branches: [ '*' ]

diff --git a/crypto/fipsmodule/ec/ec_test.cc b/crypto/fipsmodule/ec/ec_test.cc
@@ -1337,7 +1337,7 @@ class ECCurveTest : public testing::TestWithParam<int> {
   }
 
  private:
-  const EC_GROUP *group_;
+  const EC_GROUP *group_{};
 };
 
 TEST_P(ECCurveTest, SetAffine) {

diff --git a/crypto/fipsmodule/service_indicator/service_indicator_test.cc b/crypto/fipsmodule/service_indicator/service_indicator_test.cc
@@ -4280,7 +4280,7 @@ TEST(ServiceIndicatorTest, DRBG) {
 // Since this is running in FIPS mode it should end in FIPS
 // Update this when the AWS-LC version number is modified
 TEST(ServiceIndicatorTest, AWSLCVersionString) {
-  ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.19.0");
+  ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.20.0");
 }
 
 #else
@@ -4323,6 +4323,6 @@ TEST(ServiceIndicatorTest, BasicTest) {
 // Since this is not running in FIPS mode it shouldn't end in FIPS
 // Update this when the AWS-LC version number is modified
 TEST(ServiceIndicatorTest, AWSLCVersionString) {
-  ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.19.0");
+  ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.20.0");
 }
 #endif // AWSLC_FIPS
diff --git a/include/openssl/base.h b/include/openssl/base.h
@@ -122,7 +122,7 @@ extern "C" {
 // ServiceIndicatorTest.AWSLCVersionString
 // Note: there are two versions of this test. Only one test is compiled
 // depending on FIPS mode.
-#define AWSLC_VERSION_NUMBER_STRING "1.19.0"
+#define AWSLC_VERSION_NUMBER_STRING "1.20.0"
 
 #if defined(BORINGSSL_SHARED_LIBRARY)