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

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

Issue 515021: Linux: fix scons build so that libssl gets the right headers. (Closed)
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
« no previous file with comments | « build/linux/system.gyp ('k') | 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 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 if (rv != SECSuccess) 305 if (rv != SECSuccess)
306 LOG(INFO) << "SSL_ENABLE_SESSION_TICKETS failed. Old system nss?"; 306 LOG(INFO) << "SSL_ENABLE_SESSION_TICKETS failed. Old system nss?";
307 #else 307 #else
308 #error "You need to install NSS-3.12 or later to build chromium" 308 #error "You need to install NSS-3.12 or later to build chromium"
309 #endif 309 #endif
310 310
311 #ifdef SSL_ENABLE_DEFLATE 311 #ifdef SSL_ENABLE_DEFLATE
312 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE, PR_TRUE); 312 rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE, PR_TRUE);
313 if (rv != SECSuccess) 313 if (rv != SECSuccess)
314 LOG(INFO) << "SSL_ENABLE_DEFLATE failed. Old system nss?"; 314 LOG(INFO) << "SSL_ENABLE_DEFLATE failed. Old system nss?";
315 #else
316 #error This is a temporary hack to check that the builders are using the correct header files. It will be removed once a build has finished.
315 #endif 317 #endif
316 318
317 #ifdef SSL_NEXT_PROTO_NEGOTIATED 319 #ifdef SSL_NEXT_PROTO_NEGOTIATED
318 if (!ssl_config_.next_protos.empty()) { 320 if (!ssl_config_.next_protos.empty()) {
319 rv = SSL_SetNextProtoNego( 321 rv = SSL_SetNextProtoNego(
320 nss_fd_, 322 nss_fd_,
321 reinterpret_cast<const unsigned char *>(ssl_config_.next_protos.data()), 323 reinterpret_cast<const unsigned char *>(ssl_config_.next_protos.data()),
322 ssl_config_.next_protos.size()); 324 ssl_config_.next_protos.size());
323 if (rv != SECSuccess) 325 if (rv != SECSuccess)
324 LOG(INFO) << "SSL_SetNextProtoNego failed."; 326 LOG(INFO) << "SSL_SetNextProtoNego failed.";
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1156 } 1158 }
1157 PRErrorCode prerr = PR_GetError(); 1159 PRErrorCode prerr = PR_GetError();
1158 if (prerr == PR_WOULD_BLOCK_ERROR) { 1160 if (prerr == PR_WOULD_BLOCK_ERROR) {
1159 return ERR_IO_PENDING; 1161 return ERR_IO_PENDING;
1160 } 1162 }
1161 LeaveFunction(""); 1163 LeaveFunction("");
1162 return NetErrorFromNSPRError(prerr); 1164 return NetErrorFromNSPRError(prerr);
1163 } 1165 }
1164 1166
1165 } // namespace net 1167 } // namespace net
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698