diff options
author | Richard Levitte <levitte@openssl.org> | 2020-04-13 22:34:56 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-04-28 15:37:37 +0200 |
commit | f844f9eb44186df2f8b0cfd3264b4eb003d8c61a (patch) | |
tree | 29860f9c269b67546a418c0197066164e455a362 /crypto/initthread.c | |
parent | cf86057a1acd13b13c9bd8f7b8a14bbc0e3ffd56 (diff) |
Rename FIPS_MODE to FIPS_MODULE
This macro is used to determine if certain pieces of code should
become part of the FIPS module or not. The old name was confusing.
Fixes #11538
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11539)
Diffstat (limited to 'crypto/initthread.c')
-rw-r--r-- | crypto/initthread.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/initthread.c b/crypto/initthread.c index 6f15cda61a..8f0678970a 100644 --- a/crypto/initthread.c +++ b/crypto/initthread.c @@ -13,7 +13,7 @@ #include "prov/providercommon.h" #include "internal/thread_once.h" -#ifdef FIPS_MODE +#ifdef FIPS_MODULE /* * Thread aware code may want to be told about thread stop events. We register * to hear about those thread stop events when we see a new thread has started. @@ -37,7 +37,7 @@ struct thread_event_handler_st { THREAD_EVENT_HANDLER *next; }; -#ifndef FIPS_MODE +#ifndef FIPS_MODULE DEFINE_SPECIAL_STACK_OF(THREAD_EVENT_HANDLER_PTR, THREAD_EVENT_HANDLER *) typedef struct global_tevent_register_st GLOBAL_TEVENT_REGISTER; @@ -77,7 +77,7 @@ static GLOBAL_TEVENT_REGISTER *get_global_tevent_register(void) } #endif -#ifndef FIPS_MODE +#ifndef FIPS_MODULE static int init_thread_push_handlers(THREAD_EVENT_HANDLER **hands); static void init_thread_remove_handlers(THREAD_EVENT_HANDLER **handsin); static void init_thread_destructor(void *hands); @@ -101,7 +101,7 @@ init_get_thread_local(CRYPTO_THREAD_LOCAL *local, int alloc, int keep) return NULL; } -#ifndef FIPS_MODE +#ifndef FIPS_MODULE if (!init_thread_push_handlers(hands)) { CRYPTO_THREAD_set_local(local, NULL); OPENSSL_free(hands); @@ -116,7 +116,7 @@ init_get_thread_local(CRYPTO_THREAD_LOCAL *local, int alloc, int keep) return hands; } -#ifndef FIPS_MODE +#ifndef FIPS_MODULE /* * Since per-thread-specific-data destructors are not universally * available, i.e. not on Windows, only below CRYPTO_THREAD_LOCAL key @@ -292,7 +292,7 @@ void ossl_ctx_thread_stop(void *arg) init_thread_stop(arg, hands); OPENSSL_free(hands); } -#endif /* FIPS_MODE */ +#endif /* FIPS_MODULE */ static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands) @@ -328,7 +328,7 @@ int ossl_init_thread_start(const void *index, void *arg, { THREAD_EVENT_HANDLER **hands; THREAD_EVENT_HANDLER *hand; -#ifdef FIPS_MODE +#ifdef FIPS_MODULE OPENSSL_CTX *ctx = arg; /* @@ -353,7 +353,7 @@ int ossl_init_thread_start(const void *index, void *arg, if (hands == NULL) return 0; -#ifdef FIPS_MODE +#ifdef FIPS_MODULE if (*hands == NULL) { /* * We've not yet registered any handlers for this thread. We need to get @@ -378,7 +378,7 @@ int ossl_init_thread_start(const void *index, void *arg, return 1; } -#ifndef FIPS_MODE +#ifndef FIPS_MODULE static int init_thread_deregister(void *index, int all) { GLOBAL_TEVENT_REGISTER *gtr; |