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

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

Issue 2349713004: Replace key_exchange_info with key_exchange_group. (Closed)
Patch Set: rebase Created 4 years, 3 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/http/http_response_info_unittest.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | 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/chromium/quic_chromium_client_session.h" 5 #include "net/quic/chromium/quic_chromium_client_session.h"
6 6
7 #include <openssl/ssl.h> 7 #include <openssl/ssl.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 default: 557 default:
558 NOTREACHED(); 558 NOTREACHED();
559 return false; 559 return false;
560 } 560 }
561 int ssl_connection_status = 0; 561 int ssl_connection_status = 0;
562 SSLConnectionStatusSetCipherSuite(cipher_suite, &ssl_connection_status); 562 SSLConnectionStatusSetCipherSuite(cipher_suite, &ssl_connection_status);
563 SSLConnectionStatusSetVersion(SSL_CONNECTION_VERSION_QUIC, 563 SSLConnectionStatusSetVersion(SSL_CONNECTION_VERSION_QUIC,
564 &ssl_connection_status); 564 &ssl_connection_status);
565 565
566 // Report the QUIC key exchange as the corresponding TLS curve. 566 // Report the QUIC key exchange as the corresponding TLS curve.
567 uint16_t curve;
568 switch (crypto_stream_->crypto_negotiated_params().key_exchange) { 567 switch (crypto_stream_->crypto_negotiated_params().key_exchange) {
569 case kP256: 568 case kP256:
570 curve = SSL_CURVE_SECP256R1; 569 ssl_info->key_exchange_group = SSL_CURVE_SECP256R1;
571 break; 570 break;
572 case kC255: 571 case kC255:
573 curve = SSL_CURVE_X25519; 572 ssl_info->key_exchange_group = SSL_CURVE_X25519;
574 break; 573 break;
575 default: 574 default:
576 NOTREACHED(); 575 NOTREACHED();
577 return false; 576 return false;
578 } 577 }
579 ssl_info->key_exchange_info = curve;
580 578
581 ssl_info->public_key_hashes = cert_verify_result_->public_key_hashes; 579 ssl_info->public_key_hashes = cert_verify_result_->public_key_hashes;
582 ssl_info->is_issued_by_known_root = 580 ssl_info->is_issued_by_known_root =
583 cert_verify_result_->is_issued_by_known_root; 581 cert_verify_result_->is_issued_by_known_root;
584 ssl_info->pkp_bypassed = pkp_bypassed_; 582 ssl_info->pkp_bypassed = pkp_bypassed_;
585 583
586 ssl_info->connection_status = ssl_connection_status; 584 ssl_info->connection_status = ssl_connection_status;
587 ssl_info->client_cert_sent = false; 585 ssl_info->client_cert_sent = false;
588 ssl_info->channel_id_sent = crypto_stream_->WasChannelIDSent(); 586 ssl_info->channel_id_sent = crypto_stream_->WasChannelIDSent();
589 ssl_info->security_bits = security_bits; 587 ssl_info->security_bits = security_bits;
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 } 1398 }
1401 1399
1402 const LoadTimingInfo::ConnectTiming& 1400 const LoadTimingInfo::ConnectTiming&
1403 QuicChromiumClientSession::GetConnectTiming() { 1401 QuicChromiumClientSession::GetConnectTiming() {
1404 connect_timing_.ssl_start = connect_timing_.connect_start; 1402 connect_timing_.ssl_start = connect_timing_.connect_start;
1405 connect_timing_.ssl_end = connect_timing_.connect_end; 1403 connect_timing_.ssl_end = connect_timing_.connect_end;
1406 return connect_timing_; 1404 return connect_timing_;
1407 } 1405 }
1408 1406
1409 } // namespace net 1407 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_response_info_unittest.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698