Use QUIC_ARRAYSIZE instead of arraysize in crypto files gfe-relnote: n/a - no behavior change PiperOrigin-RevId: 239496329 Change-Id: Iff01797a2eae8bef8897e8366c6cb0ab7b61bac6
diff --git a/quic/core/crypto/chacha_base_decrypter.cc b/quic/core/crypto/chacha_base_decrypter.cc index e58fb1e..eb1e95f 100644 --- a/quic/core/crypto/chacha_base_decrypter.cc +++ b/quic/core/crypto/chacha_base_decrypter.cc
@@ -8,6 +8,7 @@ #include "third_party/boringssl/src/include/openssl/chacha.h" #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" +#include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" namespace quic { @@ -32,9 +33,9 @@ QuicDataReader(sample.data(), 4, Endianness::HOST_BYTE_ORDER) .ReadUInt32(&counter); const uint8_t zeroes[] = {0, 0, 0, 0, 0}; - std::string out(arraysize(zeroes), 0); + std::string out(QUIC_ARRAYSIZE(zeroes), 0); CRYPTO_chacha_20(reinterpret_cast<uint8_t*>(const_cast<char*>(out.data())), - zeroes, arraysize(zeroes), pne_key_, nonce, counter); + zeroes, QUIC_ARRAYSIZE(zeroes), pne_key_, nonce, counter); return out; }
diff --git a/quic/core/crypto/chacha_base_encrypter.cc b/quic/core/crypto/chacha_base_encrypter.cc index 24d79d5..04d902f 100644 --- a/quic/core/crypto/chacha_base_encrypter.cc +++ b/quic/core/crypto/chacha_base_encrypter.cc
@@ -6,6 +6,7 @@ #include "third_party/boringssl/src/include/openssl/chacha.h" #include "net/third_party/quiche/src/quic/core/quic_data_reader.h" +#include "net/third_party/quiche/src/quic/platform/api/quic_arraysize.h" #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h" namespace quic { @@ -29,9 +30,9 @@ QuicDataReader(sample.data(), 4, Endianness::HOST_BYTE_ORDER) .ReadUInt32(&counter); const uint8_t zeroes[] = {0, 0, 0, 0, 0}; - std::string out(arraysize(zeroes), 0); + std::string out(QUIC_ARRAYSIZE(zeroes), 0); CRYPTO_chacha_20(reinterpret_cast<uint8_t*>(const_cast<char*>(out.data())), - zeroes, arraysize(zeroes), pne_key_, nonce, counter); + zeroes, QUIC_ARRAYSIZE(zeroes), pne_key_, nonce, counter); return out; }