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

Side by Side Diff: net/quic/quic_chromium_client_session.cc

Issue 1854273002: Remove the non-RFC 7539 variants of ChaCha20Poly1305 crypters in QUIC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « net/quic/crypto/quic_encrypter.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_chromium_client_session.h" 5 #include "net/quic/quic_chromium_client_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 // Report the TLS cipher suite that most closely resembles the crypto 523 // Report the TLS cipher suite that most closely resembles the crypto
524 // parameters of the QUIC connection. 524 // parameters of the QUIC connection.
525 QuicTag aead = crypto_stream_->crypto_negotiated_params().aead; 525 QuicTag aead = crypto_stream_->crypto_negotiated_params().aead;
526 uint16_t cipher_suite; 526 uint16_t cipher_suite;
527 int security_bits; 527 int security_bits;
528 switch (aead) { 528 switch (aead) {
529 case kAESG: 529 case kAESG:
530 cipher_suite = 0xc02f; // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 530 cipher_suite = 0xc02f; // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
531 security_bits = 128; 531 security_bits = 128;
532 break; 532 break;
533 case kCC12:
534 cipher_suite = 0xcc13; // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
535 security_bits = 256;
536 break;
537 case kCC20: 533 case kCC20:
538 cipher_suite = 0xcc13; // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 534 cipher_suite = 0xcc13; // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
539 security_bits = 256; 535 security_bits = 256;
540 break; 536 break;
541 default: 537 default:
542 NOTREACHED(); 538 NOTREACHED();
543 return false; 539 return false;
544 } 540 }
545 int ssl_connection_status = 0; 541 int ssl_connection_status = 0;
546 ssl_connection_status |= cipher_suite; 542 ssl_connection_status |= cipher_suite;
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 } 1178 }
1183 1179
1184 void QuicChromiumClientSession::DeletePromised( 1180 void QuicChromiumClientSession::DeletePromised(
1185 QuicClientPromisedInfo* promised) { 1181 QuicClientPromisedInfo* promised) {
1186 if (IsOpenStream(promised->id())) 1182 if (IsOpenStream(promised->id()))
1187 streams_pushed_and_claimed_count_++; 1183 streams_pushed_and_claimed_count_++;
1188 QuicClientSessionBase::DeletePromised(promised); 1184 QuicClientSessionBase::DeletePromised(promised);
1189 } 1185 }
1190 1186
1191 } // namespace net 1187 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/quic_encrypter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698