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

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

Issue 1810743002: Deprecate --quic_include_path_id_in_iv. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@116808648
Patch Set: 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
« no previous file with comments | « net/quic/crypto/aead_base_decrypter_openssl.cc ('k') | net/quic/crypto/aes_128_gcm_12_decrypter_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/aead_base_encrypter_openssl.cc
diff --git a/net/quic/crypto/aead_base_encrypter_openssl.cc b/net/quic/crypto/aead_base_encrypter_openssl.cc
index 699c60ad934b0d787c0bdc2465ffa3d5bc80e00f..92856a6c0709eea2ee60075a81e5b2595202581f 100644
--- a/net/quic/crypto/aead_base_encrypter_openssl.cc
+++ b/net/quic/crypto/aead_base_encrypter_openssl.cc
@@ -120,15 +120,10 @@ bool AeadBaseEncrypter::EncryptPacket(QuicPathId path_id,
const size_t nonce_size = nonce_prefix_size_ + sizeof(packet_number);
ALIGNAS(4) char nonce_buffer[kMaxNonceSize];
memcpy(nonce_buffer, nonce_prefix_, nonce_prefix_size_);
- if (FLAGS_quic_include_path_id_in_iv) {
- uint64_t path_id_packet_number =
- QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
- memcpy(nonce_buffer + nonce_prefix_size_, &path_id_packet_number,
- sizeof(path_id_packet_number));
- } else {
- memcpy(nonce_buffer + nonce_prefix_size_, &packet_number,
- sizeof(packet_number));
- }
+ uint64_t path_id_packet_number =
+ QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
+ memcpy(nonce_buffer + nonce_prefix_size_, &path_id_packet_number,
+ sizeof(path_id_packet_number));
if (!Encrypt(StringPiece(nonce_buffer, nonce_size), associated_data,
plaintext, reinterpret_cast<unsigned char*>(output))) {
« no previous file with comments | « net/quic/crypto/aead_base_decrypter_openssl.cc ('k') | net/quic/crypto/aes_128_gcm_12_decrypter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698