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

Side by Side Diff: net/socket/ssl_client_socket_nss.cc

Issue 464083: Enable the SSL_ENABLE_FDX option since we're using SSLClientSocketNSS... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 return ERR_UNEXPECTED; 292 return ERR_UNEXPECTED;
293 293
294 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SSL3, ssl_config_.ssl3_enabled); 294 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SSL3, ssl_config_.ssl3_enabled);
295 if (rv != SECSuccess) 295 if (rv != SECSuccess)
296 return ERR_UNEXPECTED; 296 return ERR_UNEXPECTED;
297 297
298 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_TLS, ssl_config_.tls1_enabled); 298 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_TLS, ssl_config_.tls1_enabled);
299 if (rv != SECSuccess) 299 if (rv != SECSuccess)
300 return ERR_UNEXPECTED; 300 return ERR_UNEXPECTED;
301 301
302 // Full duplex is not needed for HTTPS, but needed for SPDY and WebSocket.
303 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_FDX, PR_TRUE);
304 if (rv != SECSuccess)
305 return ERR_UNEXPECTED;
306
302 #ifdef SSL_ENABLE_SESSION_TICKETS 307 #ifdef SSL_ENABLE_SESSION_TICKETS
303 // Support RFC 5077 308 // Support RFC 5077
304 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SESSION_TICKETS, PR_TRUE); 309 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_SESSION_TICKETS, PR_TRUE);
305 if (rv != SECSuccess) 310 if (rv != SECSuccess)
306 LOG(INFO) << "SSL_ENABLE_SESSION_TICKETS failed. Old system nss?"; 311 LOG(INFO) << "SSL_ENABLE_SESSION_TICKETS failed. Old system nss?";
307 #else 312 #else
308 #error "You need to install NSS-3.12 or later to build chromium" 313 #error "You need to install NSS-3.12 or later to build chromium"
309 #endif 314 #endif
310 315
311 #ifdef SSL_ENABLE_DEFLATE 316 #ifdef SSL_ENABLE_DEFLATE
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 } 1146 }
1142 PRErrorCode prerr = PR_GetError(); 1147 PRErrorCode prerr = PR_GetError();
1143 if (prerr == PR_WOULD_BLOCK_ERROR) { 1148 if (prerr == PR_WOULD_BLOCK_ERROR) {
1144 return ERR_IO_PENDING; 1149 return ERR_IO_PENDING;
1145 } 1150 }
1146 LeaveFunction(""); 1151 LeaveFunction("");
1147 return NetErrorFromNSPRError(prerr); 1152 return NetErrorFromNSPRError(prerr);
1148 } 1153 }
1149 1154
1150 } // namespace net 1155 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698