diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-04-13 23:34:56 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-28 16:37:37 +0300 |
| commit | f844f9eb44186df2f8b0cfd3264b4eb003d8c61a (patch) | |
| tree | 29860f9c269b67546a418c0197066164e455a362 /include/internal | |
| 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 'include/internal')
| -rw-r--r-- | include/internal/ffc.h | 4 | ||||
| -rw-r--r-- | include/internal/thread_once.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/internal/ffc.h b/include/internal/ffc.h index 8a948066d6..e4c4dce8fa 100644 --- a/include/internal/ffc.h +++ b/include/internal/ffc.h @@ -118,9 +118,9 @@ void ffc_params_get_validate_params(const FFC_PARAMS *params, int ffc_params_copy(FFC_PARAMS *dst, const FFC_PARAMS *src); int ffc_params_cmp(const FFC_PARAMS *a, const FFC_PARAMS *b, int ignore_q); -#ifndef FIPS_MODE +#ifndef FIPS_MODULE int ffc_params_print(BIO *bp, const FFC_PARAMS *ffc, int indent); -#endif /* FIPS_MODE */ +#endif /* FIPS_MODULE */ int ffc_params_FIPS186_4_generate(OPENSSL_CTX *libctx, FFC_PARAMS *params, diff --git a/include/internal/thread_once.h b/include/internal/thread_once.h index 177974f020..3f62bd344e 100644 --- a/include/internal/thread_once.h +++ b/include/internal/thread_once.h @@ -15,7 +15,7 @@ * OPENSSL_CTX object. In this way data will get cleaned up correctly when the * module gets unloaded. */ -#if !defined(FIPS_MODE) || defined(ALLOW_RUN_ONCE_IN_FIPS) +#if !defined(FIPS_MODULE) || defined(ALLOW_RUN_ONCE_IN_FIPS) /* * DEFINE_RUN_ONCE: Define an initialiser function that should be run exactly * once. It takes no arguments and returns and int result (1 for success or @@ -143,4 +143,4 @@ # define RUN_ONCE_ALT(once, initalt, init) \ (CRYPTO_THREAD_run_once(once, initalt##_ossl_) ? init##_ossl_ret_ : 0) -#endif /* FIPS_MODE */ +#endif /* FIPS_MODULE */ |