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

Unified Diff: net/quic/chromium/quic_chromium_client_session.cc

Issue 2272603003: Route key_exchange_group over to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/ssl_status.cc ('k') | net/ssl/ssl_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/chromium/quic_chromium_client_session.cc
diff --git a/net/quic/chromium/quic_chromium_client_session.cc b/net/quic/chromium/quic_chromium_client_session.cc
index e2759c459a9413fa5c352c19277d39ffa5276102..8bd6f43192d875baad8712a39f30855ac981527a 100644
--- a/net/quic/chromium/quic_chromium_client_session.cc
+++ b/net/quic/chromium/quic_chromium_client_session.cc
@@ -4,6 +4,8 @@
#include "net/quic/chromium/quic_chromium_client_session.h"
+#include <openssl/ssl.h>
+
#include <utility>
#include "base/callback_helpers.h"
@@ -546,10 +548,24 @@ bool QuicChromiumClientSession::GetSSLInfo(SSLInfo* ssl_info) const {
return false;
}
int ssl_connection_status = 0;
- ssl_connection_status |= cipher_suite;
- ssl_connection_status |=
- (SSL_CONNECTION_VERSION_QUIC & SSL_CONNECTION_VERSION_MASK)
- << SSL_CONNECTION_VERSION_SHIFT;
+ SSLConnectionStatusSetCipherSuite(cipher_suite, &ssl_connection_status);
+ SSLConnectionStatusSetVersion(SSL_CONNECTION_VERSION_QUIC,
+ &ssl_connection_status);
+
+ // Report the QUIC key exchange as the corresponding TLS curve.
+ uint16_t curve;
+ switch (crypto_stream_->crypto_negotiated_params().key_exchange) {
+ case kP256:
+ curve = SSL_CURVE_SECP256R1;
+ break;
+ case kC255:
+ curve = SSL_CURVE_X25519;
+ break;
+ default:
+ NOTREACHED();
+ return false;
+ }
+ ssl_info->key_exchange_info = curve;
ssl_info->public_key_hashes = cert_verify_result_->public_key_hashes;
ssl_info->is_issued_by_known_root =
« no previous file with comments | « content/public/common/ssl_status.cc ('k') | net/ssl/ssl_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698