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

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1615943003: Remove unnecessary ERR_CHANNEL_ID_IMPORT_FAILED codepath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/channel_id_chromium.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 393e718672fb2a2cacf630b9a4c67c116f19e024..02a3efcdd7f1e893b26e30248c56a0e2e42ea8b4 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -1257,13 +1257,9 @@ int SSLClientSocketOpenSSL::DoChannelIDLookupComplete(int result) {
if (result < 0)
return result;
- if (!channel_id_key_) {
- LOG(ERROR) << "Failed to import Channel ID.";
- return ERR_CHANNEL_ID_IMPORT_FAILED;
- }
-
// Hand the key to OpenSSL. Check for error in case OpenSSL rejects the key
// type.
+ DCHECK(channel_id_key_);
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
int rv = SSL_set1_tls_channel_id(ssl_, channel_id_key_->key());
if (!rv) {
« no previous file with comments | « net/quic/crypto/channel_id_chromium.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698