Skip to content

Commit

Permalink
Only update thread_states_list if freed state is head when prev is NU…
Browse files Browse the repository at this point in the history
…LL (#1294)

* Only update thread_states_list if freed state is head when prev is NULL.
* Bump version
  • Loading branch information
skmcgrail authored Nov 9, 2023
1 parent 507de72 commit 3b58566
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion crypto/fipsmodule/rand/rand.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,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;
}

Expand Down
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 @@ -4276,7 +4276,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.17.2");
ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.17.3");
}

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

#if defined(BORINGSSL_SHARED_LIBRARY)

Expand Down

0 comments on commit 3b58566

Please sign in to comment.