diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 13:35:49 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 13:35:49 +0000 |
| commit | 11f40349ae8b6a644399d7b609a3c702873ddc3b (patch) | |
| tree | 5143f91c042f713d09c488ce652d16e3625dc32b /net/socket | |
| parent | df89c555395b0f0585dbe56cb6ddbf1029c1e9ab (diff) | |
| download | chromium_src-11f40349ae8b6a644399d7b609a3c702873ddc3b.zip chromium_src-11f40349ae8b6a644399d7b609a3c702873ddc3b.tar.gz chromium_src-11f40349ae8b6a644399d7b609a3c702873ddc3b.tar.bz2 | |
Clean-up style issues in net:: related to X.509 data-types, eliminating unnecessary includes and marking platform-specific implementations as such. Also clearly document that CertPrincipal::Matches() is not suitable for security-relevant name checks.
In addition, because x509_cert_types.h no longer includes base/singleton.h, fix all the classes that broke because they weren't including what they used.
BUG=none
TEST=existing
Review URL: http://codereview.chromium.org/5162001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 3234320..cefe630 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -47,12 +47,6 @@ #include "net/socket/ssl_client_socket_nss.h" -#if defined(USE_SYSTEM_SSL) -#include <dlfcn.h> -#endif -#if defined(OS_MACOSX) -#include <Security/Security.h> -#endif #include <certdb.h> #include <hasht.h> #include <keyhi.h> @@ -97,6 +91,18 @@ #include "net/socket/ssl_error_params.h" #include "net/socket/ssl_host_info.h" +#if defined(USE_SYSTEM_SSL) +#include <dlfcn.h> +#endif +#if defined(OS_WIN) +#include <windows.h> +#include <wincrypt.h> +#elif defined(OS_MACOSX) +#include <Security/SecBase.h> +#include <Security/SecCertificate.h> +#include <Security/SecIdentity.h> +#endif + static const int kRecvBufferSize = 4096; // kCorkTimeoutMs is the number of milliseconds for which we'll wait for a |