Skip to content

Commit

Permalink
Revert "Bump version to 2.0 for FIPS (#1225)" (#1227)
Browse files Browse the repository at this point in the history
This reverts commit 8772d19.

Versioning scheme needs more discussion before our next FIPS branch is
cut.
  • Loading branch information
samuel40791765 authored Oct 6, 2023
1 parent 8772d19 commit 8a65bd3
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 @@ -4125,7 +4125,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.0");
ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.16.0");
}

#else
Expand Down Expand Up @@ -4168,6 +4168,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.0");
ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.16.0");
}
#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 @@ -224,7 +224,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.0"
#define AWSLC_VERSION_NUMBER_STRING "1.16.0"

#if defined(BORINGSSL_SHARED_LIBRARY)

Expand Down

0 comments on commit 8a65bd3

Please sign in to comment.