diff options
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/ssl_info.h | 6 | ||||
| -rw-r--r-- | net/base/x509_certificate.h | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h index 07655eb..1bd3771 100644 --- a/net/base/ssl_info.h +++ b/net/base/ssl_info.h @@ -27,8 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef NET_BASE_SSL_INFO_H__ -#define NET_BASE_SSL_INFO_H__ +#ifndef NET_BASE_SSL_INFO_H_ +#define NET_BASE_SSL_INFO_H_ #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" @@ -99,4 +99,4 @@ class SSLInfo { } // namespace net -#endif // NET_BASE_SSL_INFO_H__ +#endif // NET_BASE_SSL_INFO_H_ diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h index 3d0f779..729fdc2 100644 --- a/net/base/x509_certificate.h +++ b/net/base/x509_certificate.h @@ -30,9 +30,6 @@ #ifndef NET_BASE_X509_CERTIFICATE_H_ #define NET_BASE_X509_CERTIFICATE_H_ -#include <windows.h> -#include <wincrypt.h> - #include <set> #include <string> #include <vector> @@ -40,6 +37,11 @@ #include "base/ref_counted.h" #include "base/time.h" +#if defined(OS_WIN) +#include <windows.h> +#include <wincrypt.h> +#endif + class Pickle; namespace net { @@ -65,8 +67,13 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> { bool operator() (X509Certificate* lhs, X509Certificate* rhs) const; }; +#if defined(OS_WIN) typedef PCCERT_CONTEXT OSCertHandle; - +#else + // TODO(ericroman): not implemented + typedef void* OSCertHandle; +#endif + // Principal represent an X.509 principal. struct Principal { Principal() { } @@ -180,7 +187,7 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> { // in the underlying crypto library. explicit X509Certificate(OSCertHandle cert_handle); - friend RefCountedThreadSafe<X509Certificate>; + friend class base::RefCountedThreadSafe<X509Certificate>; ~X509Certificate(); // Common object initialization code. Called by the constructors only. |