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

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

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void OnHandshakeIOComplete(int result); 137 void OnHandshakeIOComplete(int result);
138 138
139 int DoHandshakeLoop(int last_io_result); 139 int DoHandshakeLoop(int last_io_result);
140 int DoHandshake(); 140 int DoHandshake();
141 int DoHandshakeComplete(int result); 141 int DoHandshakeComplete(int result);
142 int DoVerifyCert(int result); 142 int DoVerifyCert(int result);
143 int DoVerifyCertComplete(int result); 143 int DoVerifyCertComplete(int result);
144 144
145 void VerifyCT(); 145 void VerifyCT();
146 146
147 void LogConnectionTypeMetrics() const;
148
149 // The following methods are for debugging bug 65948. Will remove this code 147 // The following methods are for debugging bug 65948. Will remove this code
150 // after fixing bug 65948. 148 // after fixing bug 65948.
151 void EnsureThreadIdAssigned() const; 149 void EnsureThreadIdAssigned() const;
152 bool CalledOnValidThread() const; 150 bool CalledOnValidThread() const;
153 151
154 // Adds the SignedCertificateTimestamps from ct_verify_result_ to |ssl_info|. 152 // Adds the SignedCertificateTimestamps from ct_verify_result_ to |ssl_info|.
155 // SCTs are held in three separate vectors in ct_verify_result, each 153 // SCTs are held in three separate vectors in ct_verify_result, each
156 // vetor representing a particular verification state, this method associates 154 // vetor representing a particular verification state, this method associates
157 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to 155 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to
158 // the |ssl_info|.signed_certificate_timestamps list. 156 // the |ssl_info|.signed_certificate_timestamps list.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Added the following code Debugging in release mode. 209 // Added the following code Debugging in release mode.
212 mutable base::Lock lock_; 210 mutable base::Lock lock_;
213 // This is mutable so that CalledOnValidThread can set it. 211 // This is mutable so that CalledOnValidThread can set it.
214 // It's guarded by |lock_|. 212 // It's guarded by |lock_|.
215 mutable base::PlatformThreadId valid_thread_id_; 213 mutable base::PlatformThreadId valid_thread_id_;
216 }; 214 };
217 215
218 } // namespace net 216 } // namespace net
219 217
220 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 218 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698