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

Side by Side Diff: net/base/x509_certificate.h

Issue 1769010: [Mac] Add locking as speculative fix for X509Certificate crashes. (Closed)
Patch Set: Created 10 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | net/base/x509_certificate_mac.cc » ('j') | net/base/x509_certificate_mac.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_BASE_X509_CERTIFICATE_H_ 5 #ifndef NET_BASE_X509_CERTIFICATE_H_
6 #define NET_BASE_X509_CERTIFICATE_H_ 6 #define NET_BASE_X509_CERTIFICATE_H_
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 // A handle to the certificate object in the underlying crypto library. 287 // A handle to the certificate object in the underlying crypto library.
288 OSCertHandle cert_handle_; 288 OSCertHandle cert_handle_;
289 289
290 #if defined(OS_MACOSX) || defined(OS_WIN) 290 #if defined(OS_MACOSX) || defined(OS_WIN)
291 // Untrusted intermediate certificates associated with this certificate 291 // Untrusted intermediate certificates associated with this certificate
292 // that may be needed for chain building. (NSS impl does not need these.) 292 // that may be needed for chain building. (NSS impl does not need these.)
293 OSCertHandles intermediate_ca_certs_; 293 OSCertHandles intermediate_ca_certs_;
294 #endif 294 #endif
295 295
296 #if defined(OS_MACOSX)
297 // Blocks multiple threads from verifying the cert simultaneously.
298 mutable Lock lock_;
wtc 2010/04/27 00:06:43 Nit: perhaps rename this lock "verify_lock_" to st
299 #endif
300
296 // Where the certificate comes from. 301 // Where the certificate comes from.
297 Source source_; 302 Source source_;
298 303
299 DISALLOW_COPY_AND_ASSIGN(X509Certificate); 304 DISALLOW_COPY_AND_ASSIGN(X509Certificate);
300 }; 305 };
301 306
302 } // namespace net 307 } // namespace net
303 308
304 #endif // NET_BASE_X509_CERTIFICATE_H_ 309 #endif // NET_BASE_X509_CERTIFICATE_H_
OLDNEW
« no previous file with comments | « no previous file | net/base/x509_certificate_mac.cc » ('j') | net/base/x509_certificate_mac.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698