Skip to content

Commit

Permalink
[fips-2022-11-02] Prepare v2.0.15 release (#1768)
Browse files Browse the repository at this point in the history
## What's Changed
* Fix aws-lc-rs GH CI for FIPS-2.x branch by @justsmth in
#1651
* Allow aarch64 CPUID capability check for all Linux platforms by
@skmcgrail in #1762
* [fips-2022-11-02] Backport Latest TLS Transfer Version by @skmcgrail
in #1764

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and the ISC license.
  • Loading branch information
skmcgrail authored Aug 14, 2024
1 parent 79d2b13 commit ec94d74
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions crypto/fipsmodule/service_indicator/service_indicator_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4051,7 +4051,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 2.0.14");
ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 2.0.15");
}

#else
Expand Down Expand Up @@ -4094,6 +4094,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 2.0.14");
ASSERT_STREQ(awslc_version_string(), "AWS-LC 2.0.15");
}
#endif // AWSLC_FIPS
2 changes: 1 addition & 1 deletion include/openssl/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,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 "2.0.14"
#define AWSLC_VERSION_NUMBER_STRING "2.0.15"

#if defined(BORINGSSL_SHARED_LIBRARY)

Expand Down

0 comments on commit ec94d74

Please sign in to comment.