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

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 20598007: NSS: rename ALPN extension to have _xtn suffix. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update wtc's land that landed in the meantime. Created 7 years, 5 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 | « no previous file | net/third_party/nss/patches/alpn.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 69e3e7ac7f04a7ff97efd800c3cc0bcf9361c2c8..a5645b997acfe9195082b697f9a9624a876574ac 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1283,11 +1283,11 @@ SECStatus SSLClientSocketNSS::Core::OwnAuthCertHandler(
// failure in the ssl_Get1stHandshakeLock call in SSL_OptionSet.
PRBool negotiated_extension;
SECStatus rv = SSL_HandshakeNegotiatedExtension(socket,
- ssl_next_proto_nego_xtn,
+ ssl_app_layer_protocol_xtn,
&negotiated_extension);
if (rv != SECSuccess || !negotiated_extension) {
rv = SSL_HandshakeNegotiatedExtension(socket,
- ssl_application_layer_protocol,
+ ssl_next_proto_nego_xtn,
&negotiated_extension);
}
if (rv != SECSuccess || !negotiated_extension) {
« no previous file with comments | « no previous file | net/third_party/nss/patches/alpn.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698