X.509-related cleanup

net/socket/ssl_client_socket_nss.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 32 matching lines @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "net/socket/ssl_client_socket_nss.h"
 
 #if defined(USE_SYSTEM_SSL)
 #include <dlfcn.h>
 #endif
-#if defined(OS_MACOSX)
+#if defined(OS_WIN)
+#include <windows.h>
+#include <wincrypt.h>
+#elif defined(OS_MACOSX)
+// <Security/Security.h> must be included before NSS due to conflicting
+// identifiers for cipher suites (Security.framework uses an enum, NSS uses a

[wtc, 2010/11/17 21:31:53]

I believe the only conflicting identifier is
SSL_NULL_WITH_NULL_NULL.  Can you confirm that?
That would be useful info to note here.

[Ryan Sleevi, 2010/11/18 08:21:36]

No, it's all the cipher suites that follow the standard names. sslproto.h of NSS
defines them for NSS, <Security/CipherSuite.h> (included by
<Security/Security.h>) defines them for SecureTransport. The compiler is just
reporting the first error.

I went with explicitly specifying the headers to include, since it seems that
pattern is accepted/preferred elsewhere in the codebase with things like Cocoa
or Foundation, so it would seem acceptable here for Security.framework to avoid
pulling in all of Security.h

+// #define)
 #include <Security/Security.h>
 #endif
+
 #include <certdb.h>
 #include <hasht.h>
 #include <keyhi.h>
 #include <nspr.h>
 #include <nss.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
 #include <ssl.h>
 #include <sslerr.h>
@@ skipping 2533 matching lines @@
     case SSL_CONNECTION_VERSION_TLS1_1:
       UpdateConnectionTypeHistograms(CONNECTION_SSL_TLS1_1);
       break;
     case SSL_CONNECTION_VERSION_TLS1_2:
       UpdateConnectionTypeHistograms(CONNECTION_SSL_TLS1_2);
       break;
   };
 }
 
 }  // namespace net