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

Unified Diff: net/quic/crypto/chacha20_poly1305_decrypter_test.cc

Issue 1811043002: Landing Recent QUIC changes until 2016-03-15 16:26 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add an export clause. Created 4 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
Index: net/quic/crypto/chacha20_poly1305_decrypter_test.cc
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
index 585c1605eb0e0ba3c06116cc49c0199b389fc79a..5fac2d5b8b663ba9b544f802a54638c2aa543e71 100644
--- a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
@@ -82,11 +82,9 @@ QuicData* DecryptWithNonce(ChaCha20Poly1305Decrypter* decrypter,
decrypter->SetNoncePrefix(nonce_prefix);
memcpy(&packet_number, nonce.data() + nonce_prefix.size(),
sizeof(packet_number));
- if (FLAGS_quic_include_path_id_in_iv) {
- path_id = static_cast<QuicPathId>(
- packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
- packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
- }
+ path_id = static_cast<QuicPathId>(
+ packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
+ packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
scoped_ptr<char[]> output(new char[ciphertext.length()]);
size_t output_length = 0;
const bool success = decrypter->DecryptPacket(
« no previous file with comments | « net/quic/crypto/aes_128_gcm_12_decrypter_test.cc ('k') | net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698