diff --git a/crypto/fipsmodule/rand/rand.c b/crypto/fipsmodule/rand/rand.c index 29c5e4da3f..f56bb67ab4 100644 --- a/crypto/fipsmodule/rand/rand.c +++ b/crypto/fipsmodule/rand/rand.c @@ -134,7 +134,7 @@ static void rand_thread_state_free(void *state_in) { if (state->prev != NULL) { state->prev->next = state->next; - } else { + } else if (*thread_states_list_bss_get() == state) { *thread_states_list_bss_get() = state->next; } diff --git a/crypto/fipsmodule/service_indicator/service_indicator_test.cc b/crypto/fipsmodule/service_indicator/service_indicator_test.cc index 557ad7477d..f9e0f23e22 100644 --- a/crypto/fipsmodule/service_indicator/service_indicator_test.cc +++ b/crypto/fipsmodule/service_indicator/service_indicator_test.cc @@ -2138,7 +2138,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.1.3"); + ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.1.4"); } #else @@ -2183,6 +2183,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.1.3"); + ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.1.4"); } #endif // AWSLC_FIPS diff --git a/include/openssl/base.h b/include/openssl/base.h index 9a919cca98..0744f5ae49 100644 --- a/include/openssl/base.h +++ b/include/openssl/base.h @@ -206,7 +206,7 @@ extern "C" { // In order to keep track of any changes to AWLC we introduce a string that tracks with the public Github // release version at https://github.com/awslabs/aws-lc -#define AWSLC_VERSION_NUMBER_STRING "1.1.3" +#define AWSLC_VERSION_NUMBER_STRING "1.1.4" #if defined(BORINGSSL_SHARED_LIBRARY)