| OLD | NEW |
| 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 #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 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 | |
| 9 // until NSS 3.12.2 comes out and we update to it. | |
| 10 #define Lock FOO_NSS_Lock | |
| 11 #include <certt.h> | 8 #include <certt.h> |
| 12 #undef Lock | |
| 13 #include <keyt.h> | 9 #include <keyt.h> |
| 14 #include <nspr.h> | 10 #include <nspr.h> |
| 15 #include <nss.h> | 11 #include <nss.h> |
| 16 | 12 |
| 17 #include <string> | 13 #include <string> |
| 18 #include <vector> | 14 #include <vector> |
| 19 | 15 |
| 20 #include "base/scoped_ptr.h" | 16 #include "base/scoped_ptr.h" |
| 21 #include "net/base/cert_verify_result.h" | 17 #include "net/base/cert_verify_result.h" |
| 22 #include "net/base/completion_callback.h" | 18 #include "net/base/completion_callback.h" |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 memio_Private* nss_bufs_; | 149 memio_Private* nss_bufs_; |
| 154 | 150 |
| 155 scoped_refptr<LoadLog> load_log_; | 151 scoped_refptr<LoadLog> load_log_; |
| 156 | 152 |
| 157 static bool nss_options_initialized_; | 153 static bool nss_options_initialized_; |
| 158 }; | 154 }; |
| 159 | 155 |
| 160 } // namespace net | 156 } // namespace net |
| 161 | 157 |
| 162 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ | 158 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ |
| OLD | NEW |