Use quiche string libraries in //third_party/quic/core/crypto
gfe-relnote: n/a, no functional change
PiperOrigin-RevId: 285405224
Change-Id: I4a7f6d34ee42a2929cbbff2f303ee36b5b6ceb8a
diff --git a/quic/core/crypto/cert_compressor_test.cc b/quic/core/crypto/cert_compressor_test.cc
index 1341f79..a7517f4 100644
--- a/quic/core/crypto/cert_compressor_test.cc
+++ b/quic/core/crypto/cert_compressor_test.cc
@@ -9,8 +9,9 @@
#include "net/third_party/quiche/src/quic/core/quic_utils.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
-#include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
#include "net/third_party/quiche/src/quic/test_tools/crypto_test_utils.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
+#include "net/third_party/quiche/src/common/platform/api/quiche_text_utils.h"
namespace quic {
namespace test {
@@ -20,8 +21,8 @@
TEST_F(CertCompressorTest, EmptyChain) {
std::vector<std::string> chain;
const std::string compressed = CertCompressor::CompressChain(
- chain, QuicStringPiece(), QuicStringPiece(), nullptr);
- EXPECT_EQ("00", QuicTextUtils::HexEncode(compressed));
+ chain, quiche::QuicheStringPiece(), quiche::QuicheStringPiece(), nullptr);
+ EXPECT_EQ("00", quiche::QuicheTextUtils::HexEncode(compressed));
std::vector<std::string> chain2, cached_certs;
ASSERT_TRUE(CertCompressor::DecompressChain(compressed, cached_certs, nullptr,
@@ -33,9 +34,10 @@
std::vector<std::string> chain;
chain.push_back("testcert");
const std::string compressed = CertCompressor::CompressChain(
- chain, QuicStringPiece(), QuicStringPiece(), nullptr);
+ chain, quiche::QuicheStringPiece(), quiche::QuicheStringPiece(), nullptr);
ASSERT_GE(compressed.size(), 2u);
- EXPECT_EQ("0100", QuicTextUtils::HexEncode(compressed.substr(0, 2)));
+ EXPECT_EQ("0100",
+ quiche::QuicheTextUtils::HexEncode(compressed.substr(0, 2)));
std::vector<std::string> chain2, cached_certs;
ASSERT_TRUE(CertCompressor::DecompressChain(compressed, cached_certs, nullptr,
@@ -52,15 +54,15 @@
crypto_test_utils::MockCommonCertSets(chain[0], set_hash, 1));
const std::string compressed = CertCompressor::CompressChain(
chain,
- QuicStringPiece(reinterpret_cast<const char*>(&set_hash),
- sizeof(set_hash)),
- QuicStringPiece(), common_sets.get());
+ quiche::QuicheStringPiece(reinterpret_cast<const char*>(&set_hash),
+ sizeof(set_hash)),
+ quiche::QuicheStringPiece(), common_sets.get());
EXPECT_EQ(
"03" /* common */
"2a00000000000000" /* set hash 42 */
"01000000" /* index 1 */
"00" /* end of list */,
- QuicTextUtils::HexEncode(compressed));
+ quiche::QuicheTextUtils::HexEncode(compressed));
std::vector<std::string> chain2, cached_certs;
ASSERT_TRUE(CertCompressor::DecompressChain(compressed, cached_certs,
@@ -73,13 +75,14 @@
std::vector<std::string> chain;
chain.push_back("testcert");
uint64_t hash = QuicUtils::FNV1a_64_Hash(chain[0]);
- QuicStringPiece hash_bytes(reinterpret_cast<char*>(&hash), sizeof(hash));
+ quiche::QuicheStringPiece hash_bytes(reinterpret_cast<char*>(&hash),
+ sizeof(hash));
const std::string compressed = CertCompressor::CompressChain(
- chain, QuicStringPiece(), hash_bytes, nullptr);
+ chain, quiche::QuicheStringPiece(), hash_bytes, nullptr);
- EXPECT_EQ("02" /* cached */ + QuicTextUtils::HexEncode(hash_bytes) +
+ EXPECT_EQ("02" /* cached */ + quiche::QuicheTextUtils::HexEncode(hash_bytes) +
"00" /* end of list */,
- QuicTextUtils::HexEncode(compressed));
+ quiche::QuicheTextUtils::HexEncode(compressed));
std::vector<std::string> cached_certs, chain2;
cached_certs.push_back(chain[0]);
@@ -93,26 +96,26 @@
std::vector<std::string> cached_certs, chain;
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("04") /* bad entry type */, cached_certs,
- nullptr, &chain));
+ quiche::QuicheTextUtils::HexEncode("04") /* bad entry type */,
+ cached_certs, nullptr, &chain));
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("01") /* no terminator */, cached_certs, nullptr,
- &chain));
+ quiche::QuicheTextUtils::HexEncode("01") /* no terminator */,
+ cached_certs, nullptr, &chain));
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("0200") /* hash truncated */, cached_certs,
- nullptr, &chain));
+ quiche::QuicheTextUtils::HexEncode("0200") /* hash truncated */,
+ cached_certs, nullptr, &chain));
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("0300") /* hash and index truncated */,
+ quiche::QuicheTextUtils::HexEncode("0300") /* hash and index truncated */,
cached_certs, nullptr, &chain));
/* without a CommonCertSets */
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("03"
- "0000000000000000"
- "00000000"),
+ quiche::QuicheTextUtils::HexEncode("03"
+ "0000000000000000"
+ "00000000"),
cached_certs, nullptr, &chain));
std::unique_ptr<CommonCertSets> common_sets(
@@ -120,9 +123,9 @@
/* incorrect hash and index */
EXPECT_FALSE(CertCompressor::DecompressChain(
- QuicTextUtils::HexEncode("03"
- "a200000000000000"
- "00000000"),
+ quiche::QuicheTextUtils::HexEncode("03"
+ "a200000000000000"
+ "00000000"),
cached_certs, nullptr, &chain));
}
