Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: net/quic/core/crypto/quic_decrypter.cc

Issue 2740453006: Add QuicStringPiece which is actually StringPiece. (Closed)
Patch Set: fix compile error and rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/crypto/quic_decrypter.h ('k') | net/quic/core/crypto/quic_encrypter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/crypto/quic_decrypter.cc
diff --git a/net/quic/core/crypto/quic_decrypter.cc b/net/quic/core/crypto/quic_decrypter.cc
index f7719144bcf357bda7063ffbc512ebc1e553ca31..99c2a814d8bfd369a7d783209fa19ae8c378ca75 100644
--- a/net/quic/core/crypto/quic_decrypter.cc
+++ b/net/quic/core/crypto/quic_decrypter.cc
@@ -11,7 +11,6 @@
#include "net/quic/core/crypto/null_decrypter.h"
#include "net/quic/platform/api/quic_logging.h"
-using base::StringPiece;
using std::string;
namespace net {
@@ -30,15 +29,15 @@ QuicDecrypter* QuicDecrypter::Create(QuicTag algorithm) {
}
// static
-void QuicDecrypter::DiversifyPreliminaryKey(StringPiece preliminary_key,
- StringPiece nonce_prefix,
+void QuicDecrypter::DiversifyPreliminaryKey(QuicStringPiece preliminary_key,
+ QuicStringPiece nonce_prefix,
const DiversificationNonce& nonce,
size_t key_size,
size_t nonce_prefix_size,
string* out_key,
string* out_nonce_prefix) {
crypto::HKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(),
- StringPiece(nonce.data(), nonce.size()),
+ QuicStringPiece(nonce.data(), nonce.size()),
"QUIC key diversification", 0, key_size, 0,
nonce_prefix_size, 0);
*out_key = hkdf.server_write_key().as_string();
« no previous file with comments | « net/quic/core/crypto/quic_decrypter.h ('k') | net/quic/core/crypto/quic_encrypter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698