OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
554 } | 554 } |
555 return OK; | 555 return OK; |
556 } | 556 } |
557 | 557 |
558 SSLClientSocket::NextProtoStatus | 558 SSLClientSocket::NextProtoStatus |
559 SSLClientSocketNSS::GetNextProto(std::string* proto) { | 559 SSLClientSocketNSS::GetNextProto(std::string* proto) { |
560 *proto = next_proto_; | 560 *proto = next_proto_; |
561 return next_proto_status_; | 561 return next_proto_status_; |
562 } | 562 } |
563 | 563 |
564 bool SSLClientSocketNSS::WasOriginBoundCertNegotiated() { | |
565 return OriginBoundCertNegotiated(nss_fd_); | |
wtc
2011/12/06 19:22:11
As I noted in ssl_client_socket.h, I believe this
Ryan Hamilton
2011/12/06 20:03:47
Done. (FWIW, this static method is called by the
wtc
2011/12/06 20:47:03
I see. PlatformClientAuthHandler is a static meth
| |
566 } | |
567 | |
564 int SSLClientSocketNSS::Connect(OldCompletionCallback* callback) { | 568 int SSLClientSocketNSS::Connect(OldCompletionCallback* callback) { |
565 EnterFunction(""); | 569 EnterFunction(""); |
566 DCHECK(transport_.get()); | 570 DCHECK(transport_.get()); |
567 DCHECK(next_handshake_state_ == STATE_NONE); | 571 DCHECK(next_handshake_state_ == STATE_NONE); |
568 DCHECK(!user_read_callback_); | 572 DCHECK(!user_read_callback_); |
569 DCHECK(!user_write_callback_); | 573 DCHECK(!user_write_callback_); |
570 DCHECK(!user_connect_callback_); | 574 DCHECK(!user_connect_callback_); |
571 DCHECK(!user_read_buf_); | 575 DCHECK(!user_read_buf_); |
572 DCHECK(!user_write_buf_); | 576 DCHECK(!user_write_buf_); |
573 | 577 |
(...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2616 valid_thread_id_ = base::PlatformThread::CurrentId(); | 2620 valid_thread_id_ = base::PlatformThread::CurrentId(); |
2617 } | 2621 } |
2618 | 2622 |
2619 bool SSLClientSocketNSS::CalledOnValidThread() const { | 2623 bool SSLClientSocketNSS::CalledOnValidThread() const { |
2620 EnsureThreadIdAssigned(); | 2624 EnsureThreadIdAssigned(); |
2621 base::AutoLock auto_lock(lock_); | 2625 base::AutoLock auto_lock(lock_); |
2622 return valid_thread_id_ == base::PlatformThread::CurrentId(); | 2626 return valid_thread_id_ == base::PlatformThread::CurrentId(); |
2623 } | 2627 } |
2624 | 2628 |
2625 } // namespace net | 2629 } // namespace net |
OLD | NEW |