diff options
| -rw-r--r-- | absl/random/internal/BUILD.bazel | 1 | ||||
| -rw-r--r-- | absl/random/internal/randen_slow.cc | 30 | ||||
| -rw-r--r-- | absl/strings/internal/cordz_functions.cc | 14 |
3 files changed, 30 insertions, 15 deletions
diff --git a/absl/random/internal/BUILD.bazel b/absl/random/internal/BUILD.bazel index cf6b5389..8420b5c5 100644 --- a/absl/random/internal/BUILD.bazel +++ b/absl/random/internal/BUILD.bazel @@ -297,6 +297,7 @@ cc_library( ":platform", "//absl/base:config", "//absl/base:core_headers", + "//absl/base:endian", "//absl/numeric:int128", ], ) diff --git a/absl/random/internal/randen_slow.cc b/absl/random/internal/randen_slow.cc index 56aeb030..d5c9347b 100644 --- a/absl/random/internal/randen_slow.cc +++ b/absl/random/internal/randen_slow.cc @@ -19,6 +19,7 @@ #include <cstring> #include "absl/base/attributes.h" +#include "absl/base/internal/endian.h" #include "absl/numeric/int128.h" #include "absl/random/internal/platform.h" #include "absl/random/internal/randen_traits.h" @@ -40,7 +41,7 @@ namespace { // AES portions based on rijndael-alg-fst.c, // https://fastcrypto.org/front/misc/rijndael-alg-fst.c, and modified for -// little-endianness. +// platform-endianness. // // Implementation of // http://www.csrc.nist.gov/publications/fips/fips197/fips-197.pdf @@ -251,6 +252,7 @@ inline ABSL_RANDOM_INTERNAL_ATTRIBUTE_ALWAYS_INLINE void Vector128Store( inline ABSL_RANDOM_INTERNAL_ATTRIBUTE_ALWAYS_INLINE Vector128 AesRound(const Vector128& state, const Vector128& round_key) { Vector128 result; +#ifdef ABSL_IS_LITTLE_ENDIAN result.s[0] = round_key.s[0] ^ // te0[uint8_t(state.s[0])] ^ // te1[uint8_t(state.s[1] >> 8)] ^ // @@ -271,6 +273,28 @@ AesRound(const Vector128& state, const Vector128& round_key) { te1[uint8_t(state.s[0] >> 8)] ^ // te2[uint8_t(state.s[1] >> 16)] ^ // te3[uint8_t(state.s[2] >> 24)]; +#else + result.s[0] = round_key.s[0] ^ // + te0[uint8_t(state.s[0])] ^ // + te1[uint8_t(state.s[3] >> 8)] ^ // + te2[uint8_t(state.s[2] >> 16)] ^ // + te3[uint8_t(state.s[1] >> 24)]; + result.s[1] = round_key.s[1] ^ // + te0[uint8_t(state.s[1])] ^ // + te1[uint8_t(state.s[0] >> 8)] ^ // + te2[uint8_t(state.s[3] >> 16)] ^ // + te3[uint8_t(state.s[2] >> 24)]; + result.s[2] = round_key.s[2] ^ // + te0[uint8_t(state.s[2])] ^ // + te1[uint8_t(state.s[1] >> 8)] ^ // + te2[uint8_t(state.s[0] >> 16)] ^ // + te3[uint8_t(state.s[3] >> 24)]; + result.s[3] = round_key.s[3] ^ // + te0[uint8_t(state.s[3])] ^ // + te1[uint8_t(state.s[2] >> 8)] ^ // + te2[uint8_t(state.s[1] >> 16)] ^ // + te3[uint8_t(state.s[0] >> 24)]; +#endif return result; } @@ -380,7 +404,11 @@ namespace random_internal { const void* RandenSlow::GetKeys() { // Round keys for one AES per Feistel round and branch. // The canonical implementation uses first digits of Pi. +#ifdef ABSL_IS_LITTLE_ENDIAN return kRandenRoundKeys; +#else + return kRandenRoundKeysBE; +#endif } void RandenSlow::Absorb(const void* seed_void, void* state_void) { diff --git a/absl/strings/internal/cordz_functions.cc b/absl/strings/internal/cordz_functions.cc index f30080f8..48369933 100644 --- a/absl/strings/internal/cordz_functions.cc +++ b/absl/strings/internal/cordz_functions.cc @@ -24,13 +24,6 @@ #include "absl/base/internal/exponential_biased.h" #include "absl/base/internal/raw_logging.h" -// TODO(b/162942788): weak 'cordz_disabled' value. -// A strong version is in the 'cordz_disabled_hack_for_odr' library which can -// be linked in to disable cordz at compile time. -extern "C" { -bool absl_internal_cordz_disabled ABSL_ATTRIBUTE_WEAK = false; -} - namespace absl { ABSL_NAMESPACE_BEGIN namespace cord_internal { @@ -54,13 +47,6 @@ ABSL_CONST_INIT thread_local int64_t cordz_next_sample = kInitCordzNextSample; constexpr int64_t kIntervalIfDisabled = 1 << 16; ABSL_ATTRIBUTE_NOINLINE bool cordz_should_profile_slow() { - // TODO(b/162942788): check if profiling is disabled at compile time. - if (absl_internal_cordz_disabled) { - ABSL_RAW_LOG(WARNING, "Cordz info disabled at compile time"); - // We are permanently disabled: set counter to highest possible value. - cordz_next_sample = std::numeric_limits<int64_t>::max(); - return false; - } thread_local absl::base_internal::ExponentialBiased exponential_biased_generator; |