Merge branch 'main' into update-vectors-ci

Author: sgmenda

crypto/fipsmodule/rand/rand.c

@@ -15,7 +15,7 @@
 
 // rand_thread_state contains the per-thread state for the RNG.
 struct rand_thread_local_state {
-  // Thread-local CTR-DRBG state. UBE volatile state.
+  // Thread-local CTR-DRBG state. UBE unique state.
   CTR_DRBG_STATE drbg;
 
   // generate_calls_since_seed is the number of generate calls made on |drbg|
@@ -31,7 +31,7 @@ struct rand_thread_local_state {
   // generation_number caches the UBE generation number.
   uint64_t generation_number;
 
-  // Entropy source. UBE volatile state.
+  // Entropy source. UBE unique state.
   struct entropy_source_t *entropy_source;
 
   // Backward and forward references to nodes in a doubly-linked list.

crypto/ube/internal.h

@@ -16,17 +16,17 @@ extern "C" {
 // following property: if queried in an address space and then subsequently
 // queried, after an UBE occurred, a greater value will be observed.
 //
-// This function should be used to protect volatile memory. First cache a UBE
-// generation number associating it to the volatile memory at
-// creation/initialization time. Before using the volatile memory check whether
+// This function should be used to protect unique memory. First cache a UBE
+// generation number associating it to the unique memory at
+// creation/initialization time. Before using the unique memory check whether
 // the generation number has changed. Note, however, that detection methods rely
 // on technology that is unique to a platform. Hence, support for UBE detection
 // also depends on the platform AWS-LC is executed on.
 //
 // The parameter |current_generation_number| must be synchronized by the caller.
 //
 // Returns 1 on success and 0 if not supported. 0 means that UBE detection is
-// not supported and any volatile state must randomize before usage.
+// not supported and any unique state must randomize before usage.
 // In case of an error or if UBE detection is unavailable, all subsequent
 // entries will immediately return.
 OPENSSL_EXPORT int CRYPTO_get_ube_generation_number(uint64_t *current_generation_number);