| Index: net/quic/core/crypto/aead_base_encrypter.cc
|
| diff --git a/net/quic/core/crypto/aead_base_encrypter.cc b/net/quic/core/crypto/aead_base_encrypter.cc
|
| index 33183898928b54e68460b95df325abfbe5d0ee16..5620db920a23fac61182f698fb9cac4ff753797d 100644
|
| --- a/net/quic/core/crypto/aead_base_encrypter.cc
|
| +++ b/net/quic/core/crypto/aead_base_encrypter.cc
|
| @@ -12,8 +12,6 @@
|
| #include "third_party/boringssl/src/include/openssl/err.h"
|
| #include "third_party/boringssl/src/include/openssl/evp.h"
|
|
|
| -using base::StringPiece;
|
| -
|
| namespace net {
|
|
|
| namespace {
|
| @@ -54,7 +52,7 @@ AeadBaseEncrypter::AeadBaseEncrypter(const EVP_AEAD* aead_alg,
|
|
|
| AeadBaseEncrypter::~AeadBaseEncrypter() {}
|
|
|
| -bool AeadBaseEncrypter::SetKey(StringPiece key) {
|
| +bool AeadBaseEncrypter::SetKey(QuicStringPiece key) {
|
| DCHECK_EQ(key.size(), key_size_);
|
| if (key.size() != key_size_) {
|
| return false;
|
| @@ -72,7 +70,7 @@ bool AeadBaseEncrypter::SetKey(StringPiece key) {
|
| return true;
|
| }
|
|
|
| -bool AeadBaseEncrypter::SetNoncePrefix(StringPiece nonce_prefix) {
|
| +bool AeadBaseEncrypter::SetNoncePrefix(QuicStringPiece nonce_prefix) {
|
| DCHECK_EQ(nonce_prefix.size(), nonce_prefix_size_);
|
| if (nonce_prefix.size() != nonce_prefix_size_) {
|
| return false;
|
| @@ -81,9 +79,9 @@ bool AeadBaseEncrypter::SetNoncePrefix(StringPiece nonce_prefix) {
|
| return true;
|
| }
|
|
|
| -bool AeadBaseEncrypter::Encrypt(StringPiece nonce,
|
| - StringPiece associated_data,
|
| - StringPiece plaintext,
|
| +bool AeadBaseEncrypter::Encrypt(QuicStringPiece nonce,
|
| + QuicStringPiece associated_data,
|
| + QuicStringPiece plaintext,
|
| unsigned char* output) {
|
| DCHECK_EQ(nonce.size(), nonce_prefix_size_ + sizeof(QuicPacketNumber));
|
|
|
| @@ -104,8 +102,8 @@ bool AeadBaseEncrypter::Encrypt(StringPiece nonce,
|
|
|
| bool AeadBaseEncrypter::EncryptPacket(QuicVersion /*version*/,
|
| QuicPacketNumber packet_number,
|
| - StringPiece associated_data,
|
| - StringPiece plaintext,
|
| + QuicStringPiece associated_data,
|
| + QuicStringPiece plaintext,
|
| char* output,
|
| size_t* output_length,
|
| size_t max_output_length) {
|
| @@ -121,7 +119,7 @@ bool AeadBaseEncrypter::EncryptPacket(QuicVersion /*version*/,
|
| memcpy(nonce_buffer + nonce_prefix_size_, &packet_number,
|
| sizeof(packet_number));
|
|
|
| - if (!Encrypt(StringPiece(nonce_buffer, nonce_size), associated_data,
|
| + if (!Encrypt(QuicStringPiece(nonce_buffer, nonce_size), associated_data,
|
| plaintext, reinterpret_cast<unsigned char*>(output))) {
|
| return false;
|
| }
|
| @@ -145,16 +143,16 @@ size_t AeadBaseEncrypter::GetCiphertextSize(size_t plaintext_size) const {
|
| return plaintext_size + auth_tag_size_;
|
| }
|
|
|
| -StringPiece AeadBaseEncrypter::GetKey() const {
|
| - return StringPiece(reinterpret_cast<const char*>(key_), key_size_);
|
| +QuicStringPiece AeadBaseEncrypter::GetKey() const {
|
| + return QuicStringPiece(reinterpret_cast<const char*>(key_), key_size_);
|
| }
|
|
|
| -StringPiece AeadBaseEncrypter::GetNoncePrefix() const {
|
| +QuicStringPiece AeadBaseEncrypter::GetNoncePrefix() const {
|
| if (nonce_prefix_size_ == 0) {
|
| - return StringPiece();
|
| + return QuicStringPiece();
|
| }
|
| - return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
|
| - nonce_prefix_size_);
|
| + return QuicStringPiece(reinterpret_cast<const char*>(nonce_prefix_),
|
| + nonce_prefix_size_);
|
| }
|
|
|
| } // namespace net
|
|
|