Change name of macro

Author: torben-hansen

CMakeLists.txt

@@ -95,7 +95,7 @@ option(ENABLE_DATA_INDEPENDENT_TIMING "Enable automatic setting/resetting Data-I
 (DIT) flag in cryptographic functions. Currently only applicable to Arm64 (except on Windows)" OFF)
 option(ENABLE_PRE_SONAME_BUILD "Build AWS-LC without SONAME configuration for shared library builds" ON)
 option(ENABLE_SOURCE_MODIFICATION "Allow the build to update files in the source directory. This is typically done to update versioning." ON)
-option(DISABLE_USAGE_OF_CPU_JITTER_ENTROPY "Disable usage of CPU Jitter Entropy as an entropy source. This option cannot be used with the FIPS build. With this configuration, randomness generation might not use two independent entropy sources." OFF)
+option(DISABLE_CPU_JITTER_ENTROPY "Disable usage of CPU Jitter Entropy as an entropy source. This option cannot be used with the FIPS build. With this configuration, randomness generation might not use two independent entropy sources." OFF)
 
 include(cmake/go.cmake)
 
@@ -116,7 +116,7 @@ if(DISABLE_USAGE_OF_CPU_JITTER_ENTROPY)
   if(FIPS)
     message(FATAL_ERROR "Cannot opt-out of CPU Jitter for the FIPS build")
   endif()
-  add_definitions(-DDO_NOT_USE_CPU_JITTER_ENTROPY)
+  add_definitions(-DDISABLE_CPU_JITTER_ENTROPY)
   message(STATUS "Entropy source configuration: CPU Jitter opt-out")
   message(STATUS "Entropy source configured: Dynamic (default: Operating system)")
 else()

crypto/fipsmodule/rand/cpu_jitter_test.cc

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 
-#if !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if !defined(DISABLE_CPU_JITTER_ENTROPY)
 
 #include <gtest/gtest.h>
 
@@ -66,4 +66,4 @@ TEST(CPUJitterEntropyTest, Basic) {
   EXPECT_EQ(jitter_version, jent_version());
 }
 
-#endif // !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#endif // !defined(DISABLE_CPU_JITTER_ENTROPY)

crypto/fipsmodule/rand/entropy/entropy_source_test.cc

@@ -81,7 +81,7 @@ TEST(EntropySources, Configuration) {
 
 // If entropy build configuration choose to explicitly opt-out of CPU Jitter
 // Entropy
-#elif defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#elif defined(DISABLE_CPU_JITTER_ENTROPY)
   EXPECT_EQ(OPT_OUT_CPU_JITTER_ENTROPY_SOURCE, get_entropy_source_method_id_FOR_TESTING());
 
 #else

crypto/fipsmodule/rand/entropy/entropy_sources.c

@@ -77,7 +77,7 @@ static int is_snapsafe_environment(void) {
 }
 
 static int has_explicitly_opted_out_of_cpu_jitter(void) {
-#if defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if defined(DISABLE_CPU_JITTER_ENTROPY)
   return 1;
 #else
   return 0;

crypto/fipsmodule/rand/entropy/internal.h

@@ -55,20 +55,20 @@ OPENSSL_EXPORT void override_entropy_source_method_FOR_TESTING(
 
 OPENSSL_EXPORT int get_entropy_source_method_id_FOR_TESTING(void);
 
-#if !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if !defined(DISABLE_CPU_JITTER_ENTROPY)
   OPENSSL_EXPORT int tree_jitter_initialize(struct entropy_source_t *entropy_source);
   OPENSSL_EXPORT void tree_jitter_zeroize_thread_drbg(struct entropy_source_t *entropy_source);
   OPENSSL_EXPORT void tree_jitter_free_thread_drbg(struct entropy_source_t *entropy_source);
   OPENSSL_EXPORT int tree_jitter_get_seed(
     const struct entropy_source_t *entropy_source, uint8_t seed[CTR_DRBG_ENTROPY_LEN]);
-#else
+#else // !defined(DISABLE_CPU_JITTER_ENTROPY)
   // Define stubs for tree-DRBG functions that implements the entropy source
   // interface.
   static inline int tree_jitter_initialize(struct entropy_source_t *entropy_source) { return 0; }
   static inline void tree_jitter_zeroize_thread_drbg(struct entropy_source_t *entropy_source) { abort(); }
   static inline void tree_jitter_free_thread_drbg(struct entropy_source_t *entropy_source) { abort(); }
   static inline int tree_jitter_get_seed(const struct entropy_source_t *entropy_source, uint8_t seed[CTR_DRBG_ENTROPY_LEN]) { return 0; }
-#endif
+#endif // !defined(DISABLE_CPU_JITTER_ENTROPY)
 
 // rndr_multiple8 writes |len| number of bytes to |buf| generated using the
 // rndr instruction. |len| must be a multiple of 8.

crypto/fipsmodule/rand/entropy/tree_drbg_jitter_entropy.c

@@ -1,7 +1,7 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 
-#if !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if !defined(DISABLE_CPU_JITTER_ENTROPY)
 
 #include <openssl/ctrdrbg.h>
 #include <openssl/mem.h>
@@ -538,4 +538,4 @@ OPENSSL_EXPORT int set_thread_and_global_tree_drbg_reseed_counter_FOR_TESTING(
   return ret;
 }
 
-#endif // !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#endif // !defined(DISABLE_CPU_JITTER_ENTROPY)

crypto/fipsmodule/rand/entropy/tree_drbg_jitter_entropy_isolated_test.cc

@@ -1,7 +1,7 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 
-#if !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if !defined(DISABLE_CPU_JITTER_ENTROPY)
 
 #include <gtest/gtest.h>
 
@@ -554,4 +554,4 @@ TEST(treeDrbgJitterentropyTest, SkippedALL) {
 
 #endif
 
-#endif // !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#endif // !defined(DISABLE_CPU_JITTER_ENTROPY)

crypto/rand_extra/urandom_test.cc

@@ -28,7 +28,7 @@
     !defined(BORINGSSL_SHARED_LIBRARY) && \
     !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && \
     defined(USE_NR_getrandom) && !defined(AWSLC_SNAPSAFE_TESTING) && \
-    !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+    !defined(DISABLE_CPU_JITTER_ENTROPY)
 
 #include <linux/types.h>
 

tests/ci/run_posix_tests.sh

@@ -38,4 +38,4 @@ echo "Testing building with AArch64 Data-Independent Timing (DIT) on."
 build_and_test -DENABLE_DATA_INDEPENDENT_TIMING=ON -DCMAKE_BUILD_TYPE=Release
 
 echo "Testing building with opt-out CPU Jitter Entropy."
-build_and_test -DDISABLE_USAGE_OF_CPU_JITTER_ENTROPY=ON
+build_and_test -DDISABLE_CPU_JITTER_ENTROPY=ON

tool/speed.cc

@@ -2505,7 +2505,7 @@ static bool SpeedSelfTest(const std::string &selected) {
 }
 #endif
 
-#if AWSLC_API_VERSION >= 34 && !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if AWSLC_API_VERSION >= 34 && !defined(DISABLE_CPU_JITTER_ENTROPY)
 static bool SpeedJitter(size_t chunk_size) {
   struct rand_data *jitter_ec = jent_entropy_collector_alloc(0, JENT_FORCE_FIPS);
 
@@ -3103,7 +3103,7 @@ bool Speed(const std::vector<std::string> &args) {
       return false;
     }
 #endif
-#if AWSLC_API_VERSION >= 34 && !defined(DO_NOT_USE_CPU_JITTER_ENTROPY)
+#if AWSLC_API_VERSION >= 34 && !defined(DISABLE_CPU_JITTER_ENTROPY)
     if (!SpeedJitter(selected)) {
       return false;
     }